diff --git a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
index c288479af12..08c28843b6d 100644
--- a/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
+++ b/ansible_collections/arista/avd/docs/porting-guides/5.x.x.md
@@ -344,6 +344,18 @@ To retain the previous behavior set the value back to `node_id`:
 +isis_system_id_format: node_id
 ```
 
+### Shutdown interfaces and BGP towards undeployed peers by default
+
+In AVD 4.0.0, the default value of `shutdown_bgp_towards_undeployed_peers` and `shutdown_interfaces_towards_undeployed_peers` was `false`.
+In AVD 5.0.0, the default value of `shutdown_bgp_towards_undeployed_peers` and `shutdown_interfaces_towards_undeployed_peers` is changed to `true`.
+
+To retain the previous behaviour, set the value to `false`:
+
+```diff
++shutdown_bgp_towards_undeployed_peers: false
++shutdown_interfaces_towards_undeployed_peers: false
+```
+
 ## Changes to role `arista.avd.eos_cli_config_gen`
 
 TODO: Level 3 sections for each change with details on how to migrate
diff --git a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md
index c777ec19440..ce5b266cbb0 100644
--- a/ansible_collections/arista/avd/docs/release-notes/5.x.x.md
+++ b/ansible_collections/arista/avd/docs/release-notes/5.x.x.md
@@ -137,6 +137,12 @@ Previously they also accepted a string, which was autoconverted to a list.
 
 See the [porting guide](../porting-guides/5.x.x.md#) for details.
 
+#### Shutdown interfaces and BGP towards undeployed peers by default
+
+Starting AVD 5.0.0, the default value of `shutdown_bgp_towards_undeployed_peers` and `shutdown_interfaces_towards_undeployed_peers` is `true`.
+
+See the [porting guide](../porting-guides/5.x.x.md#default-value-of-shutdown_bgp_towards_undeployed_peers-and-shutdown_interfaces_towards_undeployed_peers-is-changed-to-true) for details.
+
 #### mpls_route_servers no longer accepts a string
 
 Starting AVD 5.0.0, `<node_type_key>.defaults.mpls_route_servers` only accepts a list of strings.
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md
index 3a79df45677..d30bdba48bf 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2A.md
@@ -339,12 +339,12 @@ vlan 4094
 !
 interface Ethernet1
    description DC1-SVC3A_Ethernet7
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet2
    description DC1-SVC3B_Ethernet7
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet3
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md
index 16a2334a63c..4bcccecd363 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-L2LEAF2B.md
@@ -339,12 +339,12 @@ vlan 4094
 !
 interface Ethernet1
    description DC1-SVC3A_Ethernet8
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet2
    description DC1-SVC3B_Ethernet8
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet3
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md
index 6af8599b945..290d95a5989 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE1.md
@@ -221,8 +221,8 @@ vlan internal order ascending range 1006 1199
 | Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet1 | - | 172.31.255.0/31 | default | 1500 | False | - | - |
 | Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet1 | - | 172.31.255.8/31 | default | 1500 | False | - | - |
 | Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet1 | - | 172.31.255.16/31 | default | 1500 | False | - | - |
-| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | False | - | - |
-| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | False | - | - |
+| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet1 | - | 172.31.255.24/31 | default | 1500 | True | - | - |
+| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet1 | - | 172.31.255.32/31 | default | 1500 | True | - | - |
 | Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet1 | - | 172.31.255.40/31 | default | 1500 | False | - | - |
 | Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet1 | - | 172.31.255.48/31 | default | 1500 | False | - | - |
 
@@ -253,14 +253,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet1
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.24/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet1
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.32/31
@@ -404,15 +404,15 @@ ASN Notation: asplain
 | 172.31.255.1 | 65101 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.9 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.17 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.25 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.33 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.25 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.33 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.41 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.49 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 192.168.255.5 | 65101 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.6 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.7 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.8 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.9 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.8 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.9 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.10 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.11 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 
@@ -457,9 +457,11 @@ router bgp 65001
    neighbor 172.31.255.17 description DC1-LEAF2B_Ethernet1
    neighbor 172.31.255.25 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.25 remote-as 65103
+   neighbor 172.31.255.25 shutdown
    neighbor 172.31.255.25 description DC1-SVC3A_Ethernet1
    neighbor 172.31.255.33 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.33 remote-as 65103
+   neighbor 172.31.255.33 shutdown
    neighbor 172.31.255.33 description DC1-SVC3B_Ethernet1
    neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.41 remote-as 65104
@@ -478,9 +480,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md
index c325bbe2d2e..b8b401fe37b 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE2.md
@@ -221,8 +221,8 @@ vlan internal order ascending range 1006 1199
 | Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet2 | - | 172.31.255.2/31 | default | 1500 | False | - | - |
 | Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet2 | - | 172.31.255.10/31 | default | 1500 | False | - | - |
 | Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet2 | - | 172.31.255.18/31 | default | 1500 | False | - | - |
-| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | False | - | - |
-| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | False | - | - |
+| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet2 | - | 172.31.255.26/31 | default | 1500 | True | - | - |
+| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet2 | - | 172.31.255.34/31 | default | 1500 | True | - | - |
 | Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet2 | - | 172.31.255.42/31 | default | 1500 | False | - | - |
 | Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet2 | - | 172.31.255.50/31 | default | 1500 | False | - | - |
 
@@ -253,14 +253,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet2
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.26/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet2
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.34/31
@@ -404,15 +404,15 @@ ASN Notation: asplain
 | 172.31.255.3 | 65101 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.11 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.19 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.27 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.35 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.27 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.35 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.43 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.51 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 192.168.255.5 | 65101 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.6 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.7 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.8 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.9 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.8 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.9 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.10 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.11 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 
@@ -457,9 +457,11 @@ router bgp 65001
    neighbor 172.31.255.19 description DC1-LEAF2B_Ethernet2
    neighbor 172.31.255.27 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.27 remote-as 65103
+   neighbor 172.31.255.27 shutdown
    neighbor 172.31.255.27 description DC1-SVC3A_Ethernet2
    neighbor 172.31.255.35 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.35 remote-as 65103
+   neighbor 172.31.255.35 shutdown
    neighbor 172.31.255.35 description DC1-SVC3B_Ethernet2
    neighbor 172.31.255.43 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.43 remote-as 65104
@@ -478,9 +480,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md
index 1e1be4f00de..a95b6be06da 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE3.md
@@ -221,8 +221,8 @@ vlan internal order ascending range 1006 1199
 | Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet3 | - | 172.31.255.4/31 | default | 1500 | False | - | - |
 | Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet3 | - | 172.31.255.12/31 | default | 1500 | False | - | - |
 | Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet3 | - | 172.31.255.20/31 | default | 1500 | False | - | - |
-| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | False | - | - |
-| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | False | - | - |
+| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet3 | - | 172.31.255.28/31 | default | 1500 | True | - | - |
+| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet3 | - | 172.31.255.36/31 | default | 1500 | True | - | - |
 | Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet3 | - | 172.31.255.44/31 | default | 1500 | False | - | - |
 | Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet3 | - | 172.31.255.52/31 | default | 1500 | False | - | - |
 
@@ -253,14 +253,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet3
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.28/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet3
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.36/31
@@ -404,15 +404,15 @@ ASN Notation: asplain
 | 172.31.255.5 | 65101 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.13 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.21 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.29 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.37 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.29 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.37 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.45 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.53 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 192.168.255.5 | 65101 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.6 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.7 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.8 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.9 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.8 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.9 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.10 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.11 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 
@@ -457,9 +457,11 @@ router bgp 65001
    neighbor 172.31.255.21 description DC1-LEAF2B_Ethernet3
    neighbor 172.31.255.29 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.29 remote-as 65103
+   neighbor 172.31.255.29 shutdown
    neighbor 172.31.255.29 description DC1-SVC3A_Ethernet3
    neighbor 172.31.255.37 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.37 remote-as 65103
+   neighbor 172.31.255.37 shutdown
    neighbor 172.31.255.37 description DC1-SVC3B_Ethernet3
    neighbor 172.31.255.45 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.45 remote-as 65104
@@ -478,9 +480,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md
index a9426b6bf1f..077205f0860 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/devices/DC1-SPINE4.md
@@ -221,8 +221,8 @@ vlan internal order ascending range 1006 1199
 | Ethernet1 | P2P_LINK_TO_DC1-LEAF1A_Ethernet4 | - | 172.31.255.6/31 | default | 1500 | False | - | - |
 | Ethernet2 | P2P_LINK_TO_DC1-LEAF2A_Ethernet4 | - | 172.31.255.14/31 | default | 1500 | False | - | - |
 | Ethernet3 | P2P_LINK_TO_DC1-LEAF2B_Ethernet4 | - | 172.31.255.22/31 | default | 1500 | False | - | - |
-| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | False | - | - |
-| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | False | - | - |
+| Ethernet4 | P2P_LINK_TO_DC1-SVC3A_Ethernet4 | - | 172.31.255.30/31 | default | 1500 | True | - | - |
+| Ethernet5 | P2P_LINK_TO_DC1-SVC3B_Ethernet4 | - | 172.31.255.38/31 | default | 1500 | True | - | - |
 | Ethernet6 | P2P_LINK_TO_DC1-BL1A_Ethernet4 | - | 172.31.255.46/31 | default | 1500 | False | - | - |
 | Ethernet7 | P2P_LINK_TO_DC1-BL1B_Ethernet4 | - | 172.31.255.54/31 | default | 1500 | False | - | - |
 
@@ -253,14 +253,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet4
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.30/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet4
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.38/31
@@ -404,15 +404,15 @@ ASN Notation: asplain
 | 172.31.255.7 | 65101 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.15 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.23 | 65102 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.31 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
-| 172.31.255.39 | 65103 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.31 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
+| 172.31.255.39 | 65103 | default | True | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.47 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 172.31.255.55 | 65104 | default | - | Inherited from peer group IPv4-UNDERLAY-PEERS | Inherited from peer group IPv4-UNDERLAY-PEERS | - | - | - | - | - | - |
 | 192.168.255.5 | 65101 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.6 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.7 | 65102 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.8 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
-| 192.168.255.9 | 65103 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.8 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
+| 192.168.255.9 | 65103 | default | True | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.10 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 | 192.168.255.11 | 65104 | default | - | Inherited from peer group EVPN-OVERLAY-PEERS | Inherited from peer group EVPN-OVERLAY-PEERS | - | Inherited from peer group EVPN-OVERLAY-PEERS | - | - | - | - |
 
@@ -457,9 +457,11 @@ router bgp 65001
    neighbor 172.31.255.23 description DC1-LEAF2B_Ethernet4
    neighbor 172.31.255.31 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.31 remote-as 65103
+   neighbor 172.31.255.31 shutdown
    neighbor 172.31.255.31 description DC1-SVC3A_Ethernet4
    neighbor 172.31.255.39 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.39 remote-as 65103
+   neighbor 172.31.255.39 shutdown
    neighbor 172.31.255.39 description DC1-SVC3B_Ethernet4
    neighbor 172.31.255.47 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.47 remote-as 65104
@@ -478,9 +480,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/fabric/DC1_FABRIC-topology.csv b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/fabric/DC1_FABRIC-topology.csv
index 4154acb861e..019291af1ed 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/fabric/DC1_FABRIC-topology.csv
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/documentation/fabric/DC1_FABRIC-topology.csv
@@ -13,12 +13,12 @@ l3leaf,DC1-BL1B,Ethernet5,mlag_peer,DC1-BL1A,Ethernet5,True
 l3leaf,DC1-BL1B,Ethernet6,mlag_peer,DC1-BL1A,Ethernet6,True
 l2leaf,DC1-L2LEAF1A,Ethernet1,l3leaf,DC1-LEAF2A,Ethernet7,True
 l2leaf,DC1-L2LEAF1A,Ethernet2,l3leaf,DC1-LEAF2B,Ethernet7,True
-l2leaf,DC1-L2LEAF2A,Ethernet1,l3leaf,DC1-SVC3A,Ethernet7,True
-l2leaf,DC1-L2LEAF2A,Ethernet2,l3leaf,DC1-SVC3B,Ethernet7,True
+l2leaf,DC1-L2LEAF2A,Ethernet1,l3leaf,DC1-SVC3A,Ethernet7,False
+l2leaf,DC1-L2LEAF2A,Ethernet2,l3leaf,DC1-SVC3B,Ethernet7,False
 l2leaf,DC1-L2LEAF2A,Ethernet3,mlag_peer,DC1-L2LEAF2B,Ethernet3,True
 l2leaf,DC1-L2LEAF2A,Ethernet4,mlag_peer,DC1-L2LEAF2B,Ethernet4,True
-l2leaf,DC1-L2LEAF2B,Ethernet1,l3leaf,DC1-SVC3A,Ethernet8,True
-l2leaf,DC1-L2LEAF2B,Ethernet2,l3leaf,DC1-SVC3B,Ethernet8,True
+l2leaf,DC1-L2LEAF2B,Ethernet1,l3leaf,DC1-SVC3A,Ethernet8,False
+l2leaf,DC1-L2LEAF2B,Ethernet2,l3leaf,DC1-SVC3B,Ethernet8,False
 l2leaf,DC1-L2LEAF2B,Ethernet3,mlag_peer,DC1-L2LEAF2A,Ethernet3,True
 l2leaf,DC1-L2LEAF2B,Ethernet4,mlag_peer,DC1-L2LEAF2A,Ethernet4,True
 l3leaf,DC1-LEAF1A,Ethernet1,spine,DC1-SPINE1,Ethernet1,True
@@ -46,29 +46,29 @@ l3leaf,DC1-LEAF2B,Ethernet10,server,server01_MLAG,Eth3,True
 spine,DC1-SPINE1,Ethernet1,l3leaf,DC1-LEAF1A,Ethernet1,True
 spine,DC1-SPINE1,Ethernet2,l3leaf,DC1-LEAF2A,Ethernet1,True
 spine,DC1-SPINE1,Ethernet3,l3leaf,DC1-LEAF2B,Ethernet1,True
-spine,DC1-SPINE1,Ethernet4,l3leaf,DC1-SVC3A,Ethernet1,True
-spine,DC1-SPINE1,Ethernet5,l3leaf,DC1-SVC3B,Ethernet1,True
+spine,DC1-SPINE1,Ethernet4,l3leaf,DC1-SVC3A,Ethernet1,False
+spine,DC1-SPINE1,Ethernet5,l3leaf,DC1-SVC3B,Ethernet1,False
 spine,DC1-SPINE1,Ethernet6,l3leaf,DC1-BL1A,Ethernet1,True
 spine,DC1-SPINE1,Ethernet7,l3leaf,DC1-BL1B,Ethernet1,True
 spine,DC1-SPINE2,Ethernet1,l3leaf,DC1-LEAF1A,Ethernet2,True
 spine,DC1-SPINE2,Ethernet2,l3leaf,DC1-LEAF2A,Ethernet2,True
 spine,DC1-SPINE2,Ethernet3,l3leaf,DC1-LEAF2B,Ethernet2,True
-spine,DC1-SPINE2,Ethernet4,l3leaf,DC1-SVC3A,Ethernet2,True
-spine,DC1-SPINE2,Ethernet5,l3leaf,DC1-SVC3B,Ethernet2,True
+spine,DC1-SPINE2,Ethernet4,l3leaf,DC1-SVC3A,Ethernet2,False
+spine,DC1-SPINE2,Ethernet5,l3leaf,DC1-SVC3B,Ethernet2,False
 spine,DC1-SPINE2,Ethernet6,l3leaf,DC1-BL1A,Ethernet2,True
 spine,DC1-SPINE2,Ethernet7,l3leaf,DC1-BL1B,Ethernet2,True
 spine,DC1-SPINE3,Ethernet1,l3leaf,DC1-LEAF1A,Ethernet3,True
 spine,DC1-SPINE3,Ethernet2,l3leaf,DC1-LEAF2A,Ethernet3,True
 spine,DC1-SPINE3,Ethernet3,l3leaf,DC1-LEAF2B,Ethernet3,True
-spine,DC1-SPINE3,Ethernet4,l3leaf,DC1-SVC3A,Ethernet3,True
-spine,DC1-SPINE3,Ethernet5,l3leaf,DC1-SVC3B,Ethernet3,True
+spine,DC1-SPINE3,Ethernet4,l3leaf,DC1-SVC3A,Ethernet3,False
+spine,DC1-SPINE3,Ethernet5,l3leaf,DC1-SVC3B,Ethernet3,False
 spine,DC1-SPINE3,Ethernet6,l3leaf,DC1-BL1A,Ethernet3,True
 spine,DC1-SPINE3,Ethernet7,l3leaf,DC1-BL1B,Ethernet3,True
 spine,DC1-SPINE4,Ethernet1,l3leaf,DC1-LEAF1A,Ethernet4,True
 spine,DC1-SPINE4,Ethernet2,l3leaf,DC1-LEAF2A,Ethernet4,True
 spine,DC1-SPINE4,Ethernet3,l3leaf,DC1-LEAF2B,Ethernet4,True
-spine,DC1-SPINE4,Ethernet4,l3leaf,DC1-SVC3A,Ethernet4,True
-spine,DC1-SPINE4,Ethernet5,l3leaf,DC1-SVC3B,Ethernet4,True
+spine,DC1-SPINE4,Ethernet4,l3leaf,DC1-SVC3A,Ethernet4,False
+spine,DC1-SPINE4,Ethernet5,l3leaf,DC1-SVC3B,Ethernet4,False
 spine,DC1-SPINE4,Ethernet6,l3leaf,DC1-BL1A,Ethernet4,True
 spine,DC1-SPINE4,Ethernet7,l3leaf,DC1-BL1B,Ethernet4,True
 l3leaf,DC1-SVC3A,Ethernet1,spine,DC1-SPINE1,Ethernet4,True
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg
index 726bf151f5a..c9a958a66e1 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2A.cfg
@@ -96,12 +96,12 @@ interface Port-Channel3
 !
 interface Ethernet1
    description DC1-SVC3A_Ethernet7
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet2
    description DC1-SVC3B_Ethernet7
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet3
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg
index f12127c99a6..11e21978e22 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-L2LEAF2B.cfg
@@ -96,12 +96,12 @@ interface Port-Channel3
 !
 interface Ethernet1
    description DC1-SVC3A_Ethernet8
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet2
    description DC1-SVC3B_Ethernet8
-   no shutdown
+   shutdown
    channel-group 1 mode active
 !
 interface Ethernet3
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg
index a3eb4635aa0..9ac870cc801 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE1.cfg
@@ -49,14 +49,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet1
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.24/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet1
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.32/31
@@ -129,9 +129,11 @@ router bgp 65001
    neighbor 172.31.255.17 description DC1-LEAF2B_Ethernet1
    neighbor 172.31.255.25 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.25 remote-as 65103
+   neighbor 172.31.255.25 shutdown
    neighbor 172.31.255.25 description DC1-SVC3A_Ethernet1
    neighbor 172.31.255.33 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.33 remote-as 65103
+   neighbor 172.31.255.33 shutdown
    neighbor 172.31.255.33 description DC1-SVC3B_Ethernet1
    neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.41 remote-as 65104
@@ -150,9 +152,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg
index 705682ddeb6..49f4b6a0758 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE2.cfg
@@ -49,14 +49,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet2
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.26/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet2
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.34/31
@@ -129,9 +129,11 @@ router bgp 65001
    neighbor 172.31.255.19 description DC1-LEAF2B_Ethernet2
    neighbor 172.31.255.27 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.27 remote-as 65103
+   neighbor 172.31.255.27 shutdown
    neighbor 172.31.255.27 description DC1-SVC3A_Ethernet2
    neighbor 172.31.255.35 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.35 remote-as 65103
+   neighbor 172.31.255.35 shutdown
    neighbor 172.31.255.35 description DC1-SVC3B_Ethernet2
    neighbor 172.31.255.43 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.43 remote-as 65104
@@ -150,9 +152,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg
index e6949dc0931..3ee478af952 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE3.cfg
@@ -49,14 +49,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet3
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.28/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet3
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.36/31
@@ -129,9 +129,11 @@ router bgp 65001
    neighbor 172.31.255.21 description DC1-LEAF2B_Ethernet3
    neighbor 172.31.255.29 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.29 remote-as 65103
+   neighbor 172.31.255.29 shutdown
    neighbor 172.31.255.29 description DC1-SVC3A_Ethernet3
    neighbor 172.31.255.37 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.37 remote-as 65103
+   neighbor 172.31.255.37 shutdown
    neighbor 172.31.255.37 description DC1-SVC3B_Ethernet3
    neighbor 172.31.255.45 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.45 remote-as 65104
@@ -150,9 +152,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg
index 8d5879b9350..b0da21b19a3 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/configs/DC1-SPINE4.cfg
@@ -49,14 +49,14 @@ interface Ethernet3
 !
 interface Ethernet4
    description P2P_LINK_TO_DC1-SVC3A_Ethernet4
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.30/31
 !
 interface Ethernet5
    description P2P_LINK_TO_DC1-SVC3B_Ethernet4
-   no shutdown
+   shutdown
    mtu 1500
    no switchport
    ip address 172.31.255.38/31
@@ -129,9 +129,11 @@ router bgp 65001
    neighbor 172.31.255.23 description DC1-LEAF2B_Ethernet4
    neighbor 172.31.255.31 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.31 remote-as 65103
+   neighbor 172.31.255.31 shutdown
    neighbor 172.31.255.31 description DC1-SVC3A_Ethernet4
    neighbor 172.31.255.39 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.39 remote-as 65103
+   neighbor 172.31.255.39 shutdown
    neighbor 172.31.255.39 description DC1-SVC3B_Ethernet4
    neighbor 172.31.255.47 peer group IPv4-UNDERLAY-PEERS
    neighbor 172.31.255.47 remote-as 65104
@@ -150,9 +152,11 @@ router bgp 65001
    neighbor 192.168.255.7 description DC1-LEAF2B
    neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.8 remote-as 65103
+   neighbor 192.168.255.8 shutdown
    neighbor 192.168.255.8 description DC1-SVC3A
    neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.9 remote-as 65103
+   neighbor 192.168.255.9 shutdown
    neighbor 192.168.255.9 description DC1-SVC3B
    neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.10 remote-as 65104
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml
index bd6e321159d..b379b4b47ef 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2A.yml
@@ -168,7 +168,7 @@ ethernet_interfaces:
   peer_interface: Ethernet7
   peer_type: l3leaf
   description: DC1-SVC3A_Ethernet7
-  shutdown: false
+  shutdown: true
   type: port-channel-member
   channel_group:
     id: 1
@@ -178,7 +178,7 @@ ethernet_interfaces:
   peer_interface: Ethernet7
   peer_type: l3leaf
   description: DC1-SVC3B_Ethernet7
-  shutdown: false
+  shutdown: true
   type: port-channel-member
   channel_group:
     id: 1
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml
index 6e97d743e77..7afb518ffe0 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-L2LEAF2B.yml
@@ -168,7 +168,7 @@ ethernet_interfaces:
   peer_interface: Ethernet8
   peer_type: l3leaf
   description: DC1-SVC3A_Ethernet8
-  shutdown: false
+  shutdown: true
   type: port-channel-member
   channel_group:
     id: 1
@@ -178,7 +178,7 @@ ethernet_interfaces:
   peer_interface: Ethernet8
   peer_type: l3leaf
   description: DC1-SVC3B_Ethernet8
-  shutdown: false
+  shutdown: true
   type: port-channel-member
   channel_group:
     id: 1
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml
index 865271ef267..74f9a95c247 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE1.yml
@@ -58,11 +58,13 @@ router_bgp:
     remote_as: '65103'
     peer: DC1-SVC3A
     description: DC1-SVC3A_Ethernet1
+    shutdown: true
   - ip_address: 172.31.255.33
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65103'
     peer: DC1-SVC3B
     description: DC1-SVC3B_Ethernet1
+    shutdown: true
   - ip_address: 172.31.255.41
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65104'
@@ -103,11 +105,13 @@ router_bgp:
     peer: DC1-SVC3A
     description: DC1-SVC3A
     remote_as: '65103'
+    shutdown: true
   - ip_address: 192.168.255.9
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SVC3B
     description: DC1-SVC3B
     remote_as: '65103'
+    shutdown: true
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -211,7 +215,7 @@ ethernet_interfaces:
   peer_interface: Ethernet1
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3A_Ethernet1
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.24/31
@@ -220,7 +224,7 @@ ethernet_interfaces:
   peer_interface: Ethernet1
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3B_Ethernet1
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.32/31
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml
index 30ac3302179..fe04a7b500c 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE2.yml
@@ -58,11 +58,13 @@ router_bgp:
     remote_as: '65103'
     peer: DC1-SVC3A
     description: DC1-SVC3A_Ethernet2
+    shutdown: true
   - ip_address: 172.31.255.35
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65103'
     peer: DC1-SVC3B
     description: DC1-SVC3B_Ethernet2
+    shutdown: true
   - ip_address: 172.31.255.43
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65104'
@@ -103,11 +105,13 @@ router_bgp:
     peer: DC1-SVC3A
     description: DC1-SVC3A
     remote_as: '65103'
+    shutdown: true
   - ip_address: 192.168.255.9
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SVC3B
     description: DC1-SVC3B
     remote_as: '65103'
+    shutdown: true
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -211,7 +215,7 @@ ethernet_interfaces:
   peer_interface: Ethernet2
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3A_Ethernet2
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.26/31
@@ -220,7 +224,7 @@ ethernet_interfaces:
   peer_interface: Ethernet2
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3B_Ethernet2
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.34/31
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml
index 916fd4393f2..36b779596e4 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE3.yml
@@ -58,11 +58,13 @@ router_bgp:
     remote_as: '65103'
     peer: DC1-SVC3A
     description: DC1-SVC3A_Ethernet3
+    shutdown: true
   - ip_address: 172.31.255.37
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65103'
     peer: DC1-SVC3B
     description: DC1-SVC3B_Ethernet3
+    shutdown: true
   - ip_address: 172.31.255.45
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65104'
@@ -103,11 +105,13 @@ router_bgp:
     peer: DC1-SVC3A
     description: DC1-SVC3A
     remote_as: '65103'
+    shutdown: true
   - ip_address: 192.168.255.9
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SVC3B
     description: DC1-SVC3B
     remote_as: '65103'
+    shutdown: true
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -211,7 +215,7 @@ ethernet_interfaces:
   peer_interface: Ethernet3
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3A_Ethernet3
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.28/31
@@ -220,7 +224,7 @@ ethernet_interfaces:
   peer_interface: Ethernet3
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3B_Ethernet3
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.36/31
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml
index 22c3095503b..a806a7e118f 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/DC1-SPINE4.yml
@@ -58,11 +58,13 @@ router_bgp:
     remote_as: '65103'
     peer: DC1-SVC3A
     description: DC1-SVC3A_Ethernet4
+    shutdown: true
   - ip_address: 172.31.255.39
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65103'
     peer: DC1-SVC3B
     description: DC1-SVC3B_Ethernet4
+    shutdown: true
   - ip_address: 172.31.255.47
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65104'
@@ -103,11 +105,13 @@ router_bgp:
     peer: DC1-SVC3A
     description: DC1-SVC3A
     remote_as: '65103'
+    shutdown: true
   - ip_address: 192.168.255.9
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-SVC3B
     description: DC1-SVC3B
     remote_as: '65103'
+    shutdown: true
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -211,7 +215,7 @@ ethernet_interfaces:
   peer_interface: Ethernet4
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3A_Ethernet4
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.30/31
@@ -220,7 +224,7 @@ ethernet_interfaces:
   peer_interface: Ethernet4
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1-SVC3B_Ethernet4
-  shutdown: false
+  shutdown: true
   mtu: 1500
   type: routed
   ip_address: 172.31.255.38/31
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
index 883fad09270..5f8607fec23 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp-empty-filter/cv_server_configlets.yml
@@ -274,9 +274,9 @@ cvp_configlets:
     \  switchport mode trunk\n   mlag 1\n!\ninterface Port-Channel3\n   description
     MLAG_PEER_DC1-L2LEAF2B_Po3\n   no shutdown\n   switchport\n   switchport mode
     trunk\n   switchport trunk group MLAG\n!\ninterface Ethernet1\n   description
-    DC1-SVC3A_Ethernet7\n   no shutdown\n   channel-group 1 mode active\n!\ninterface
-    Ethernet2\n   description DC1-SVC3B_Ethernet7\n   no shutdown\n   channel-group
-    1 mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2B_Ethernet3\n
+    DC1-SVC3A_Ethernet7\n   shutdown\n   channel-group 1 mode active\n!\ninterface
+    Ethernet2\n   description DC1-SVC3B_Ethernet7\n   shutdown\n   channel-group 1
+    mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2B_Ethernet3\n
     \  no shutdown\n   channel-group 3 mode active\n!\ninterface Ethernet4\n   description
     MLAG_PEER_DC1-L2LEAF2B_Ethernet4\n   no shutdown\n   channel-group 3 mode active\n!\ninterface
     Management1\n   description oob_management\n   no shutdown\n   vrf MGMT\n   ip
@@ -310,9 +310,9 @@ cvp_configlets:
     \  switchport mode trunk\n   mlag 1\n!\ninterface Port-Channel3\n   description
     MLAG_PEER_DC1-L2LEAF2A_Po3\n   no shutdown\n   switchport\n   switchport mode
     trunk\n   switchport trunk group MLAG\n!\ninterface Ethernet1\n   description
-    DC1-SVC3A_Ethernet8\n   no shutdown\n   channel-group 1 mode active\n!\ninterface
-    Ethernet2\n   description DC1-SVC3B_Ethernet8\n   no shutdown\n   channel-group
-    1 mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2A_Ethernet3\n
+    DC1-SVC3A_Ethernet8\n   shutdown\n   channel-group 1 mode active\n!\ninterface
+    Ethernet2\n   description DC1-SVC3B_Ethernet8\n   shutdown\n   channel-group 1
+    mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2A_Ethernet3\n
     \  no shutdown\n   channel-group 3 mode active\n!\ninterface Ethernet4\n   description
     MLAG_PEER_DC1-L2LEAF2A_Ethernet4\n   no shutdown\n   channel-group 3 mode active\n!\ninterface
     Management1\n   description oob_management\n   no shutdown\n   vrf MGMT\n   ip
@@ -775,9 +775,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.8/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet1\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.16/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet1\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet1\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.24/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet1\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.32/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.32/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet1\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.40/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet1\n   no shutdown\n   mtu 1500\n   no
@@ -804,31 +804,32 @@ cvp_configlets:
     description DC1-LEAF2A_Ethernet1\n   neighbor 172.31.255.17 peer group IPv4-UNDERLAY-PEERS\n
     \  neighbor 172.31.255.17 remote-as 65102\n   neighbor 172.31.255.17 description
     DC1-LEAF2B_Ethernet1\n   neighbor 172.31.255.25 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.25 remote-as 65103\n   neighbor 172.31.255.25 description
-    DC1-SVC3A_Ethernet1\n   neighbor 172.31.255.33 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.33 remote-as 65103\n   neighbor 172.31.255.33 description
-    DC1-SVC3B_Ethernet1\n   neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.41 remote-as 65104\n   neighbor 172.31.255.41 description
-    DC1-BL1A_Ethernet1\n   neighbor 172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.49 remote-as 65104\n   neighbor 172.31.255.49 description
-    DC1-BL1B_Ethernet1\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
-    \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
-    DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
-    192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
-    \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
-    remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
-    192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
-    192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
-    \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
-    DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
-    192.168.255.11 remote-as 65104\n   neighbor 192.168.255.11 description DC1-BL1B\n
-    \  redistribute connected route-map RM-CONN-2-BGP\n   !\n   address-family evpn\n
-    \     neighbor EVPN-OVERLAY-PEERS activate\n   !\n   address-family ipv4\n      no
-    neighbor EVPN-OVERLAY-PEERS activate\n      neighbor IPv4-UNDERLAY-PEERS activate\n!\nmanagement
-    api http-commands\n   protocol https\n   no shutdown\n   !\n   vrf MGMT\n      no
-    shutdown\n!\nend\n"
+    \  neighbor 172.31.255.25 remote-as 65103\n   neighbor 172.31.255.25 shutdown\n
+    \  neighbor 172.31.255.25 description DC1-SVC3A_Ethernet1\n   neighbor 172.31.255.33
+    peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.33 remote-as 65103\n   neighbor
+    172.31.255.33 shutdown\n   neighbor 172.31.255.33 description DC1-SVC3B_Ethernet1\n
+    \  neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.41
+    remote-as 65104\n   neighbor 172.31.255.41 description DC1-BL1A_Ethernet1\n   neighbor
+    172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.49 remote-as
+    65104\n   neighbor 172.31.255.49 description DC1-BL1B_Ethernet1\n   neighbor 192.168.255.5
+    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.5 remote-as 65101\n   neighbor
+    192.168.255.5 description DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description
+    DC1-LEAF2A\n   neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.7 remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n
+    \  neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8
+    remote-as 65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8
+    description DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n
+    \  neighbor 192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer
+    group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.10 remote-as 65104\n   neighbor
+    192.168.255.10 description DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.11 remote-as 65104\n   neighbor 192.168.255.11 description
+    DC1-BL1B\n   redistribute connected route-map RM-CONN-2-BGP\n   !\n   address-family
+    evpn\n      neighbor EVPN-OVERLAY-PEERS activate\n   !\n   address-family ipv4\n
+    \     no neighbor EVPN-OVERLAY-PEERS activate\n      neighbor IPv4-UNDERLAY-PEERS
+    activate\n!\nmanagement api http-commands\n   protocol https\n   no shutdown\n
+    \  !\n   vrf MGMT\n      no shutdown\n!\nend\n"
   AVD_DC1-SPINE2: "!\ndaemon TerminAttr\n   exec /usr/bin/TerminAttr -cvaddr=192.168.200.11:9910
     -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata
     -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n   no shutdown\n!\nvlan
@@ -845,9 +846,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.10/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet2\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.18/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet2\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet2\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.26/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet2\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.34/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.34/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet2\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.42/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet2\n   no shutdown\n   mtu 1500\n   no
@@ -875,21 +876,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.19 remote-as 65102\n   neighbor
     172.31.255.19 description DC1-LEAF2B_Ethernet2\n   neighbor 172.31.255.27 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.27 remote-as 65103\n   neighbor
-    172.31.255.27 description DC1-SVC3A_Ethernet2\n   neighbor 172.31.255.35 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.35 remote-as 65103\n   neighbor
-    172.31.255.35 description DC1-SVC3B_Ethernet2\n   neighbor 172.31.255.43 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.43 remote-as 65104\n   neighbor
-    172.31.255.43 description DC1-BL1A_Ethernet2\n   neighbor 172.31.255.51 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.51 remote-as 65104\n   neighbor 172.31.255.51
-    description DC1-BL1B_Ethernet2\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.27 shutdown\n   neighbor 172.31.255.27 description DC1-SVC3A_Ethernet2\n
+    \  neighbor 172.31.255.35 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.35
+    remote-as 65103\n   neighbor 172.31.255.35 shutdown\n   neighbor 172.31.255.35
+    description DC1-SVC3B_Ethernet2\n   neighbor 172.31.255.43 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.43 remote-as 65104\n   neighbor 172.31.255.43 description
+    DC1-BL1A_Ethernet2\n   neighbor 172.31.255.51 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.51 remote-as 65104\n   neighbor 172.31.255.51 description
+    DC1-BL1B_Ethernet2\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
@@ -915,9 +918,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.12/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet3\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.20/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet3\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet3\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.28/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet3\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.36/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.36/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet3\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.44/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet3\n   no shutdown\n   mtu 1500\n   no
@@ -945,21 +948,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.21 remote-as 65102\n   neighbor
     172.31.255.21 description DC1-LEAF2B_Ethernet3\n   neighbor 172.31.255.29 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.29 remote-as 65103\n   neighbor
-    172.31.255.29 description DC1-SVC3A_Ethernet3\n   neighbor 172.31.255.37 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.37 remote-as 65103\n   neighbor
-    172.31.255.37 description DC1-SVC3B_Ethernet3\n   neighbor 172.31.255.45 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.45 remote-as 65104\n   neighbor
-    172.31.255.45 description DC1-BL1A_Ethernet3\n   neighbor 172.31.255.53 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.53 remote-as 65104\n   neighbor 172.31.255.53
-    description DC1-BL1B_Ethernet3\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.29 shutdown\n   neighbor 172.31.255.29 description DC1-SVC3A_Ethernet3\n
+    \  neighbor 172.31.255.37 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.37
+    remote-as 65103\n   neighbor 172.31.255.37 shutdown\n   neighbor 172.31.255.37
+    description DC1-SVC3B_Ethernet3\n   neighbor 172.31.255.45 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.45 remote-as 65104\n   neighbor 172.31.255.45 description
+    DC1-BL1A_Ethernet3\n   neighbor 172.31.255.53 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.53 remote-as 65104\n   neighbor 172.31.255.53 description
+    DC1-BL1B_Ethernet3\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
@@ -985,9 +990,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.14/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet4\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.22/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet4\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet4\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.30/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet4\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.38/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.38/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet4\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.46/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet4\n   no shutdown\n   mtu 1500\n   no
@@ -1015,21 +1020,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.23 remote-as 65102\n   neighbor
     172.31.255.23 description DC1-LEAF2B_Ethernet4\n   neighbor 172.31.255.31 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.31 remote-as 65103\n   neighbor
-    172.31.255.31 description DC1-SVC3A_Ethernet4\n   neighbor 172.31.255.39 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.39 remote-as 65103\n   neighbor
-    172.31.255.39 description DC1-SVC3B_Ethernet4\n   neighbor 172.31.255.47 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.47 remote-as 65104\n   neighbor
-    172.31.255.47 description DC1-BL1A_Ethernet4\n   neighbor 172.31.255.55 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.55 remote-as 65104\n   neighbor 172.31.255.55
-    description DC1-BL1B_Ethernet4\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.31 shutdown\n   neighbor 172.31.255.31 description DC1-SVC3A_Ethernet4\n
+    \  neighbor 172.31.255.39 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.39
+    remote-as 65103\n   neighbor 172.31.255.39 shutdown\n   neighbor 172.31.255.39
+    description DC1-SVC3B_Ethernet4\n   neighbor 172.31.255.47 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.47 remote-as 65104\n   neighbor 172.31.255.47 description
+    DC1-BL1A_Ethernet4\n   neighbor 172.31.255.55 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.55 remote-as 65104\n   neighbor 172.31.255.55 description
+    DC1-BL1B_Ethernet4\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
diff --git a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
index 883fad09270..5f8607fec23 100644
--- a/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
+++ b/ansible_collections/arista/avd/molecule/eos_config_deploy_cvp/intended/structured_configs/cvp/cv_server_configlets.yml
@@ -274,9 +274,9 @@ cvp_configlets:
     \  switchport mode trunk\n   mlag 1\n!\ninterface Port-Channel3\n   description
     MLAG_PEER_DC1-L2LEAF2B_Po3\n   no shutdown\n   switchport\n   switchport mode
     trunk\n   switchport trunk group MLAG\n!\ninterface Ethernet1\n   description
-    DC1-SVC3A_Ethernet7\n   no shutdown\n   channel-group 1 mode active\n!\ninterface
-    Ethernet2\n   description DC1-SVC3B_Ethernet7\n   no shutdown\n   channel-group
-    1 mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2B_Ethernet3\n
+    DC1-SVC3A_Ethernet7\n   shutdown\n   channel-group 1 mode active\n!\ninterface
+    Ethernet2\n   description DC1-SVC3B_Ethernet7\n   shutdown\n   channel-group 1
+    mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2B_Ethernet3\n
     \  no shutdown\n   channel-group 3 mode active\n!\ninterface Ethernet4\n   description
     MLAG_PEER_DC1-L2LEAF2B_Ethernet4\n   no shutdown\n   channel-group 3 mode active\n!\ninterface
     Management1\n   description oob_management\n   no shutdown\n   vrf MGMT\n   ip
@@ -310,9 +310,9 @@ cvp_configlets:
     \  switchport mode trunk\n   mlag 1\n!\ninterface Port-Channel3\n   description
     MLAG_PEER_DC1-L2LEAF2A_Po3\n   no shutdown\n   switchport\n   switchport mode
     trunk\n   switchport trunk group MLAG\n!\ninterface Ethernet1\n   description
-    DC1-SVC3A_Ethernet8\n   no shutdown\n   channel-group 1 mode active\n!\ninterface
-    Ethernet2\n   description DC1-SVC3B_Ethernet8\n   no shutdown\n   channel-group
-    1 mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2A_Ethernet3\n
+    DC1-SVC3A_Ethernet8\n   shutdown\n   channel-group 1 mode active\n!\ninterface
+    Ethernet2\n   description DC1-SVC3B_Ethernet8\n   shutdown\n   channel-group 1
+    mode active\n!\ninterface Ethernet3\n   description MLAG_PEER_DC1-L2LEAF2A_Ethernet3\n
     \  no shutdown\n   channel-group 3 mode active\n!\ninterface Ethernet4\n   description
     MLAG_PEER_DC1-L2LEAF2A_Ethernet4\n   no shutdown\n   channel-group 3 mode active\n!\ninterface
     Management1\n   description oob_management\n   no shutdown\n   vrf MGMT\n   ip
@@ -775,9 +775,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.8/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet1\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.16/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet1\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet1\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.24/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet1\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.32/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.32/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet1\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.40/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet1\n   no shutdown\n   mtu 1500\n   no
@@ -804,31 +804,32 @@ cvp_configlets:
     description DC1-LEAF2A_Ethernet1\n   neighbor 172.31.255.17 peer group IPv4-UNDERLAY-PEERS\n
     \  neighbor 172.31.255.17 remote-as 65102\n   neighbor 172.31.255.17 description
     DC1-LEAF2B_Ethernet1\n   neighbor 172.31.255.25 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.25 remote-as 65103\n   neighbor 172.31.255.25 description
-    DC1-SVC3A_Ethernet1\n   neighbor 172.31.255.33 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.33 remote-as 65103\n   neighbor 172.31.255.33 description
-    DC1-SVC3B_Ethernet1\n   neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.41 remote-as 65104\n   neighbor 172.31.255.41 description
-    DC1-BL1A_Ethernet1\n   neighbor 172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n
-    \  neighbor 172.31.255.49 remote-as 65104\n   neighbor 172.31.255.49 description
-    DC1-BL1B_Ethernet1\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
-    \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
-    DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
-    192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
-    \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
-    remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
-    192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
-    192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
-    \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
-    DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
-    192.168.255.11 remote-as 65104\n   neighbor 192.168.255.11 description DC1-BL1B\n
-    \  redistribute connected route-map RM-CONN-2-BGP\n   !\n   address-family evpn\n
-    \     neighbor EVPN-OVERLAY-PEERS activate\n   !\n   address-family ipv4\n      no
-    neighbor EVPN-OVERLAY-PEERS activate\n      neighbor IPv4-UNDERLAY-PEERS activate\n!\nmanagement
-    api http-commands\n   protocol https\n   no shutdown\n   !\n   vrf MGMT\n      no
-    shutdown\n!\nend\n"
+    \  neighbor 172.31.255.25 remote-as 65103\n   neighbor 172.31.255.25 shutdown\n
+    \  neighbor 172.31.255.25 description DC1-SVC3A_Ethernet1\n   neighbor 172.31.255.33
+    peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.33 remote-as 65103\n   neighbor
+    172.31.255.33 shutdown\n   neighbor 172.31.255.33 description DC1-SVC3B_Ethernet1\n
+    \  neighbor 172.31.255.41 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.41
+    remote-as 65104\n   neighbor 172.31.255.41 description DC1-BL1A_Ethernet1\n   neighbor
+    172.31.255.49 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.49 remote-as
+    65104\n   neighbor 172.31.255.49 description DC1-BL1B_Ethernet1\n   neighbor 192.168.255.5
+    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.5 remote-as 65101\n   neighbor
+    192.168.255.5 description DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description
+    DC1-LEAF2A\n   neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.7 remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n
+    \  neighbor 192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8
+    remote-as 65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8
+    description DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n
+    \  neighbor 192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer
+    group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.10 remote-as 65104\n   neighbor
+    192.168.255.10 description DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n
+    \  neighbor 192.168.255.11 remote-as 65104\n   neighbor 192.168.255.11 description
+    DC1-BL1B\n   redistribute connected route-map RM-CONN-2-BGP\n   !\n   address-family
+    evpn\n      neighbor EVPN-OVERLAY-PEERS activate\n   !\n   address-family ipv4\n
+    \     no neighbor EVPN-OVERLAY-PEERS activate\n      neighbor IPv4-UNDERLAY-PEERS
+    activate\n!\nmanagement api http-commands\n   protocol https\n   no shutdown\n
+    \  !\n   vrf MGMT\n      no shutdown\n!\nend\n"
   AVD_DC1-SPINE2: "!\ndaemon TerminAttr\n   exec /usr/bin/TerminAttr -cvaddr=192.168.200.11:9910
     -cvauth=key,telarista -cvvrf=MGMT -smashexcludes=ale,flexCounter,hardware,kni,pulse,strata
     -ingestexclude=/Sysdb/cell/1/agent,/Sysdb/cell/2/agent -taillogs\n   no shutdown\n!\nvlan
@@ -845,9 +846,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.10/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet2\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.18/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet2\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet2\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.26/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet2\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.34/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.34/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet2\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.42/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet2\n   no shutdown\n   mtu 1500\n   no
@@ -875,21 +876,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.19 remote-as 65102\n   neighbor
     172.31.255.19 description DC1-LEAF2B_Ethernet2\n   neighbor 172.31.255.27 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.27 remote-as 65103\n   neighbor
-    172.31.255.27 description DC1-SVC3A_Ethernet2\n   neighbor 172.31.255.35 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.35 remote-as 65103\n   neighbor
-    172.31.255.35 description DC1-SVC3B_Ethernet2\n   neighbor 172.31.255.43 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.43 remote-as 65104\n   neighbor
-    172.31.255.43 description DC1-BL1A_Ethernet2\n   neighbor 172.31.255.51 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.51 remote-as 65104\n   neighbor 172.31.255.51
-    description DC1-BL1B_Ethernet2\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.27 shutdown\n   neighbor 172.31.255.27 description DC1-SVC3A_Ethernet2\n
+    \  neighbor 172.31.255.35 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.35
+    remote-as 65103\n   neighbor 172.31.255.35 shutdown\n   neighbor 172.31.255.35
+    description DC1-SVC3B_Ethernet2\n   neighbor 172.31.255.43 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.43 remote-as 65104\n   neighbor 172.31.255.43 description
+    DC1-BL1A_Ethernet2\n   neighbor 172.31.255.51 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.51 remote-as 65104\n   neighbor 172.31.255.51 description
+    DC1-BL1B_Ethernet2\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
@@ -915,9 +918,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.12/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet3\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.20/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet3\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet3\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.28/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet3\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.36/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.36/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet3\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.44/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet3\n   no shutdown\n   mtu 1500\n   no
@@ -945,21 +948,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.21 remote-as 65102\n   neighbor
     172.31.255.21 description DC1-LEAF2B_Ethernet3\n   neighbor 172.31.255.29 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.29 remote-as 65103\n   neighbor
-    172.31.255.29 description DC1-SVC3A_Ethernet3\n   neighbor 172.31.255.37 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.37 remote-as 65103\n   neighbor
-    172.31.255.37 description DC1-SVC3B_Ethernet3\n   neighbor 172.31.255.45 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.45 remote-as 65104\n   neighbor
-    172.31.255.45 description DC1-BL1A_Ethernet3\n   neighbor 172.31.255.53 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.53 remote-as 65104\n   neighbor 172.31.255.53
-    description DC1-BL1B_Ethernet3\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.29 shutdown\n   neighbor 172.31.255.29 description DC1-SVC3A_Ethernet3\n
+    \  neighbor 172.31.255.37 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.37
+    remote-as 65103\n   neighbor 172.31.255.37 shutdown\n   neighbor 172.31.255.37
+    description DC1-SVC3B_Ethernet3\n   neighbor 172.31.255.45 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.45 remote-as 65104\n   neighbor 172.31.255.45 description
+    DC1-BL1A_Ethernet3\n   neighbor 172.31.255.53 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.53 remote-as 65104\n   neighbor 172.31.255.53 description
+    DC1-BL1B_Ethernet3\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
@@ -985,9 +990,9 @@ cvp_configlets:
     1500\n   no switchport\n   ip address 172.31.255.14/31\n!\ninterface Ethernet3\n
     \  description P2P_LINK_TO_DC1-LEAF2B_Ethernet4\n   no shutdown\n   mtu 1500\n
     \  no switchport\n   ip address 172.31.255.22/31\n!\ninterface Ethernet4\n   description
-    P2P_LINK_TO_DC1-SVC3A_Ethernet4\n   no shutdown\n   mtu 1500\n   no switchport\n
+    P2P_LINK_TO_DC1-SVC3A_Ethernet4\n   shutdown\n   mtu 1500\n   no switchport\n
     \  ip address 172.31.255.30/31\n!\ninterface Ethernet5\n   description P2P_LINK_TO_DC1-SVC3B_Ethernet4\n
-    \  no shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.38/31\n!\ninterface
+    \  shutdown\n   mtu 1500\n   no switchport\n   ip address 172.31.255.38/31\n!\ninterface
     Ethernet6\n   description P2P_LINK_TO_DC1-BL1A_Ethernet4\n   no shutdown\n   mtu
     1500\n   no switchport\n   ip address 172.31.255.46/31\n!\ninterface Ethernet7\n
     \  description P2P_LINK_TO_DC1-BL1B_Ethernet4\n   no shutdown\n   mtu 1500\n   no
@@ -1015,21 +1020,23 @@ cvp_configlets:
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.23 remote-as 65102\n   neighbor
     172.31.255.23 description DC1-LEAF2B_Ethernet4\n   neighbor 172.31.255.31 peer
     group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.31 remote-as 65103\n   neighbor
-    172.31.255.31 description DC1-SVC3A_Ethernet4\n   neighbor 172.31.255.39 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.39 remote-as 65103\n   neighbor
-    172.31.255.39 description DC1-SVC3B_Ethernet4\n   neighbor 172.31.255.47 peer
-    group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.47 remote-as 65104\n   neighbor
-    172.31.255.47 description DC1-BL1A_Ethernet4\n   neighbor 172.31.255.55 peer group
-    IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.55 remote-as 65104\n   neighbor 172.31.255.55
-    description DC1-BL1B_Ethernet4\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
+    172.31.255.31 shutdown\n   neighbor 172.31.255.31 description DC1-SVC3A_Ethernet4\n
+    \  neighbor 172.31.255.39 peer group IPv4-UNDERLAY-PEERS\n   neighbor 172.31.255.39
+    remote-as 65103\n   neighbor 172.31.255.39 shutdown\n   neighbor 172.31.255.39
+    description DC1-SVC3B_Ethernet4\n   neighbor 172.31.255.47 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.47 remote-as 65104\n   neighbor 172.31.255.47 description
+    DC1-BL1A_Ethernet4\n   neighbor 172.31.255.55 peer group IPv4-UNDERLAY-PEERS\n
+    \  neighbor 172.31.255.55 remote-as 65104\n   neighbor 172.31.255.55 description
+    DC1-BL1B_Ethernet4\n   neighbor 192.168.255.5 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.5 remote-as 65101\n   neighbor 192.168.255.5 description
     DC1-LEAF1A\n   neighbor 192.168.255.6 peer group EVPN-OVERLAY-PEERS\n   neighbor
     192.168.255.6 remote-as 65102\n   neighbor 192.168.255.6 description DC1-LEAF2A\n
     \  neighbor 192.168.255.7 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.7
     remote-as 65102\n   neighbor 192.168.255.7 description DC1-LEAF2B\n   neighbor
     192.168.255.8 peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.8 remote-as
-    65103\n   neighbor 192.168.255.8 description DC1-SVC3A\n   neighbor 192.168.255.9
-    peer group EVPN-OVERLAY-PEERS\n   neighbor 192.168.255.9 remote-as 65103\n   neighbor
+    65103\n   neighbor 192.168.255.8 shutdown\n   neighbor 192.168.255.8 description
+    DC1-SVC3A\n   neighbor 192.168.255.9 peer group EVPN-OVERLAY-PEERS\n   neighbor
+    192.168.255.9 remote-as 65103\n   neighbor 192.168.255.9 shutdown\n   neighbor
     192.168.255.9 description DC1-SVC3B\n   neighbor 192.168.255.10 peer group EVPN-OVERLAY-PEERS\n
     \  neighbor 192.168.255.10 remote-as 65104\n   neighbor 192.168.255.10 description
     DC1-BL1A\n   neighbor 192.168.255.11 peer group EVPN-OVERLAY-PEERS\n   neighbor
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg
index e57f73ecd39..c7257344aa8 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/configs/DC1-SPINE4.cfg
@@ -142,7 +142,7 @@ interface Ethernet27
 !
 interface Ethernet28
    description P2P_LINK_TO_DC1_UNDEPLOYED_LEAF1A_Ethernet52/1
-   shutdown
+   no shutdown
    mtu 1500
    speed 100g-2
    no switchport
@@ -150,7 +150,7 @@ interface Ethernet28
 !
 interface Ethernet29
    description P2P_LINK_TO_DC1_UNDEPLOYED_LEAF1B_Ethernet52/1
-   shutdown
+   no shutdown
    mtu 1500
    speed forced 100gfull
    no switchport
@@ -240,11 +240,9 @@ router bgp 65001
    neighbor 172.31.255.71 description DC1-CL1B_Ethernet4
    neighbor 172.31.255.135 peer group UNDERLAY-PEERS
    neighbor 172.31.255.135 remote-as 65110
-   neighbor 172.31.255.135 shutdown
    neighbor 172.31.255.135 description DC1_UNDEPLOYED_LEAF1A_Ethernet52/1
    neighbor 172.31.255.167 peer group UNDERLAY-PEERS
    neighbor 172.31.255.167 remote-as 65111
-   neighbor 172.31.255.167 shutdown
    neighbor 172.31.255.167 description DC1_UNDEPLOYED_LEAF1B_Ethernet52/1
    neighbor 192.168.42.42 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.42.42 remote-as 65101
@@ -281,11 +279,9 @@ router bgp 65001
    neighbor 192.168.255.19 description DC1-CL1B
    neighbor 192.168.255.21 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.21 remote-as 65110
-   neighbor 192.168.255.21 shutdown
    neighbor 192.168.255.21 description DC1_UNDEPLOYED_LEAF1A
    neighbor 192.168.255.22 peer group EVPN-OVERLAY-PEERS
    neighbor 192.168.255.22 remote-as 65111
-   neighbor 192.168.255.22 shutdown
    neighbor 192.168.255.22 description DC1_UNDEPLOYED_LEAF1B
    redistribute connected route-map RM-CONN-2-BGP
    !
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml
index 2d53cfb4ac4..f64f78309a1 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/intended/structured_configs/DC1-SPINE4.yml
@@ -108,13 +108,11 @@ router_bgp:
     remote_as: '65110'
     peer: DC1_UNDEPLOYED_LEAF1A
     description: DC1_UNDEPLOYED_LEAF1A_Ethernet52/1
-    shutdown: true
   - ip_address: 172.31.255.167
     peer_group: UNDERLAY-PEERS
     remote_as: '65111'
     peer: DC1_UNDEPLOYED_LEAF1B
     description: DC1_UNDEPLOYED_LEAF1B_Ethernet52/1
-    shutdown: true
   - ip_address: 192.168.255.14
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1-BL1A
@@ -175,13 +173,11 @@ router_bgp:
     peer: DC1_UNDEPLOYED_LEAF1A
     description: DC1_UNDEPLOYED_LEAF1A
     remote_as: '65110'
-    shutdown: true
   - ip_address: 192.168.255.22
     peer_group: EVPN-OVERLAY-PEERS
     peer: DC1_UNDEPLOYED_LEAF1B
     description: DC1_UNDEPLOYED_LEAF1B
     remote_as: '65111'
-    shutdown: true
   address_family_evpn:
     peer_groups:
     - name: EVPN-OVERLAY-PEERS
@@ -404,7 +400,7 @@ ethernet_interfaces:
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1_UNDEPLOYED_LEAF1A_Ethernet52/1
   speed: 100g-2
-  shutdown: true
+  shutdown: false
   mtu: 1500
   type: routed
   ip_address: 172.31.255.134/31
@@ -414,7 +410,7 @@ ethernet_interfaces:
   peer_type: l3leaf
   description: P2P_LINK_TO_DC1_UNDEPLOYED_LEAF1B_Ethernet52/1
   speed: forced 100gfull
-  shutdown: true
+  shutdown: false
   mtu: 1500
   type: routed
   ip_address: 172.31.255.166/31
diff --git a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml
index 3b549dd5992..dfa57b3c8ee 100644
--- a/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml
+++ b/ansible_collections/arista/avd/molecule/eos_designs_unit_tests/inventory/host_vars/DC1-SPINE4.yml
@@ -1,4 +1,10 @@
 ---
+# If the device is set to "is_deployed: false" at the host_vars level, then do not shutdown interfaces towards undeployed peers.
+shutdown_interfaces_towards_undeployed_peers: false
+
+# If the device is set to "is_deployed: false" at the host_vars level, then do not shutdown bgp towards undeployed peers.
+shutdown_bgp_towards_undeployed_peers: false
+
 # Testing the suggested method to roll back the change of default platform settings for R3 series.
 custom_platform_settings:
   - platforms:
diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml
index d64f43d379f..7211e103af7 100644
--- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml
+++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine1.yml
@@ -59,6 +59,7 @@ router_bgp:
     remote_as: '65102'
     peer: dc1-leaf2b
     description: dc1-leaf2b_Ethernet1
+    shutdown: true
   - ip_address: 10.33.255.17
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65133'
@@ -89,6 +90,7 @@ router_bgp:
     peer: dc1-leaf2b
     description: dc1-leaf2b
     remote_as: '65102'
+    shutdown: true
   - ip_address: 10.33.0.5
     peer_group: EVPN-OVERLAY-PEERS
     peer: dc1-svc-leaf1a
diff --git a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml
index 815a7e8b844..33d8268c50d 100644
--- a/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml
+++ b/ansible_collections/arista/avd/molecule/eos_validate_state/intended/structured_configs/dc1-spine2.yml
@@ -65,6 +65,7 @@ router_bgp:
     remote_as: '65102'
     peer: dc1-leaf2b
     description: dc1-leaf2b_Ethernet2
+    shutdown: true
   - ip_address: 10.33.255.19
     peer_group: IPv4-UNDERLAY-PEERS
     remote_as: '65133'
@@ -95,6 +96,7 @@ router_bgp:
     peer: dc1-leaf2b
     description: dc1-leaf2b
     remote_as: '65102'
+    shutdown: true
   - ip_address: 10.33.0.5
     peer_group: EVPN-OVERLAY-PEERS
     peer: dc1-svc-leaf1a
diff --git a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md
index 2d6fe6dcac5..d41665d5221 100644
--- a/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md
+++ b/ansible_collections/arista/avd/roles/eos_designs/docs/tables/fabric-settings.md
@@ -12,8 +12,8 @@
     | [<samp>only_local_vlan_trunk_groups</samp>](## "only_local_vlan_trunk_groups") | Boolean |  | `False` |  | A vlan can have many trunk_groups assigned.<br>To avoid unneeded configuration changes on all leaf switches when a new trunk group is added,<br>this feature will only configure the vlan trunk groups matched with local connected_endpoints.<br>See "Details on only_local_vlan_trunk_groups" below.<br>Requires "enable_trunk_groups: true".<br> |
     | [<samp>p2p_uplinks_mtu</samp>](## "p2p_uplinks_mtu") | Integer |  | `9214` | Min: 68<br>Max: 65535 | Point to Point Links MTU. |
     | [<samp>p2p_uplinks_qos_profile</samp>](## "p2p_uplinks_qos_profile") | String |  |  |  | QOS Profile assigned on all infrastructure links. |
-    | [<samp>shutdown_bgp_towards_undeployed_peers</samp>](## "shutdown_bgp_towards_undeployed_peers") | Boolean |  | `False` |  | When a device is set undeployed using `is_deployed: false` and `shutdown_bgp_towards_undeployed_peers` key is set to true, the BGP neighborship is shutdown on the peer. |
-    | [<samp>shutdown_interfaces_towards_undeployed_peers</samp>](## "shutdown_interfaces_towards_undeployed_peers") | Boolean |  | `False` |  | - It is possible to provision configurations for a complete topology but flag devices as undeployed using the host level variable `is_deployed: false`.<br><br>```yaml<br># Use at the host level<br>is_deployed: < true or false or default -> true ><br>```<br><br>- By default, this will have no impact within the `eos_designs` role. Configs will still be generated by the `eos_cli_config_gen` role and will still be pushed by the `eos_config_deploy_eapi` directly to devices if used.<br>- However, if the `eos_config_deploy_cvp` role is used to push configurations, CloudVision will ignore the devices flagged  as `is_deployed: false` and not attempt to configure them.<br>- If the device is not present in the network due to CloudVision not configuring the device, `eos_validate_state` role will fail tests on peers of the undeployed device trying to verify that interfaces are up.<br>- To overcome this and shutdown interfaces towards undeployed peers, the variable `shutdown_interfaces_towards_undeployed_peers` can be used, satisfying the `eos_validate_state` role interface tests.<br>- Again, this is only an issue if `eos_config_deploy_cvp` is used and the devices are not present in the network.<br> |
+    | [<samp>shutdown_bgp_towards_undeployed_peers</samp>](## "shutdown_bgp_towards_undeployed_peers") | Boolean |  | `True` |  | When a device is set undeployed using `is_deployed: false` and `shutdown_bgp_towards_undeployed_peers` key is set to true, the BGP neighborship is shutdown on the peer. |
+    | [<samp>shutdown_interfaces_towards_undeployed_peers</samp>](## "shutdown_interfaces_towards_undeployed_peers") | Boolean |  | `True` |  | - It is possible to provision configurations for a complete topology but flag devices as undeployed using the host level variable `is_deployed: false`.<br><br>```yaml<br># Use at the host level<br>is_deployed: < true or false or default -> true ><br>```<br><br>- By default, this will have no impact within the `eos_designs` role. Configs will still be generated by the `eos_cli_config_gen` role and will still be pushed by the `eos_config_deploy_eapi` directly to devices if used.<br>- However, if the `eos_config_deploy_cvp` role is used to push configurations, CloudVision will ignore the devices flagged  as `is_deployed: false` and not attempt to configure them.<br>- If the device is not present in the network due to CloudVision not configuring the device, `eos_validate_state` role will fail tests on peers of the undeployed device trying to verify that interfaces are up.<br>- To overcome this and shutdown interfaces towards undeployed peers, the variable `shutdown_interfaces_towards_undeployed_peers` can be used, satisfying the `eos_validate_state` role interface tests.<br>- Again, this is only an issue if `eos_config_deploy_cvp` is used and the devices are not present in the network.<br> |
     | [<samp>trunk_groups</samp>](## "trunk_groups") | Dictionary |  |  |  |  |
     | [<samp>&nbsp;&nbsp;mlag</samp>](## "trunk_groups.mlag") | Dictionary |  |  |  | Trunk Group used for MLAG VLAN (Typically VLAN 4094).<br> |
     | [<samp>&nbsp;&nbsp;&nbsp;&nbsp;name</samp>](## "trunk_groups.mlag.name") | String |  | `MLAG` |  |  |
@@ -69,7 +69,7 @@
     p2p_uplinks_qos_profile: <str>
 
     # When a device is set undeployed using `is_deployed: false` and `shutdown_bgp_towards_undeployed_peers` key is set to true, the BGP neighborship is shutdown on the peer.
-    shutdown_bgp_towards_undeployed_peers: <bool; default=False>
+    shutdown_bgp_towards_undeployed_peers: <bool; default=True>
 
     # - It is possible to provision configurations for a complete topology but flag devices as undeployed using the host level variable `is_deployed: false`.
     #
@@ -83,7 +83,7 @@
     # - If the device is not present in the network due to CloudVision not configuring the device, `eos_validate_state` role will fail tests on peers of the undeployed device trying to verify that interfaces are up.
     # - To overcome this and shutdown interfaces towards undeployed peers, the variable `shutdown_interfaces_towards_undeployed_peers` can be used, satisfying the `eos_validate_state` role interface tests.
     # - Again, this is only an issue if `eos_config_deploy_cvp` is used and the devices are not present in the network.
-    shutdown_interfaces_towards_undeployed_peers: <bool; default=False>
+    shutdown_interfaces_towards_undeployed_peers: <bool; default=True>
     trunk_groups:
 
       # Trunk Group used for MLAG VLAN (Typically VLAN 4094).
diff --git a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
index 690ff5ecc02..0aea03c4ec9 100644
--- a/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
+++ b/python-avd/pyavd/_eos_designs/schema/eos_designs.schema.yml
@@ -3428,14 +3428,14 @@ keys:
     documentation_options:
       table: fabric-settings
     type: bool
-    default: false
+    default: true
     description: 'When a device is set undeployed using `is_deployed: false` and `shutdown_bgp_towards_undeployed_peers`
       key is set to true, the BGP neighborship is shutdown on the peer.'
   shutdown_interfaces_towards_undeployed_peers:
     documentation_options:
       table: fabric-settings
     type: bool
-    default: false
+    default: true
     description: '- It is possible to provision configurations for a complete topology
       but flag devices as undeployed using the host level variable `is_deployed: false`.
 
diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_bgp_towards_undeployed_peers.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_bgp_towards_undeployed_peers.schema.yml
index 257a6b539fe..54b8c527d97 100644
--- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_bgp_towards_undeployed_peers.schema.yml
+++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_bgp_towards_undeployed_peers.schema.yml
@@ -10,6 +10,6 @@ keys:
     documentation_options:
       table: fabric-settings
     type: bool
-    default: false
+    default: true
     description: |-
       When a device is set undeployed using `is_deployed: false` and `shutdown_bgp_towards_undeployed_peers` key is set to true, the BGP neighborship is shutdown on the peer.
diff --git a/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_interfaces_towards_undeployed_peers.schema.yml b/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_interfaces_towards_undeployed_peers.schema.yml
index c9d80b9db1b..7507a20cde6 100644
--- a/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_interfaces_towards_undeployed_peers.schema.yml
+++ b/python-avd/pyavd/_eos_designs/schema/schema_fragments/shutdown_interfaces_towards_undeployed_peers.schema.yml
@@ -10,7 +10,7 @@ keys:
     documentation_options:
       table: fabric-settings
     type: bool
-    default: false
+    default: true
     description: |
       - It is possible to provision configurations for a complete topology but flag devices as undeployed using the host level variable `is_deployed: false`.
 
diff --git a/python-avd/pyavd/_eos_designs/shared_utils/misc.py b/python-avd/pyavd/_eos_designs/shared_utils/misc.py
index 4e2b945d284..57651f45d26 100644
--- a/python-avd/pyavd/_eos_designs/shared_utils/misc.py
+++ b/python-avd/pyavd/_eos_designs/shared_utils/misc.py
@@ -202,11 +202,11 @@ def evpn_short_esi_prefix(self: SharedUtils) -> str:
 
     @cached_property
     def shutdown_interfaces_towards_undeployed_peers(self: SharedUtils) -> bool:
-        return get(self.hostvars, "shutdown_interfaces_towards_undeployed_peers") is True
+        return get(self.hostvars, "shutdown_interfaces_towards_undeployed_peers", default=True) is True
 
     @cached_property
     def shutdown_bgp_towards_undeployed_peers(self: SharedUtils) -> bool:
-        return get(self.hostvars, "shutdown_bgp_towards_undeployed_peers") is True
+        return get(self.hostvars, "shutdown_bgp_towards_undeployed_peers", default=True) is True
 
     @cached_property
     def bfd_multihop(self: SharedUtils) -> dict: