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: