diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
index c44c7bc9..f5028788 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
@@ -735,7 +735,6 @@ resources:
 
   leaf02:
     type: OS::Nova::Server
-    depends_on: leaf02-trunk
     properties:
       image: {get_param: [switch_params, image]}
       flavor: {get_param: [switch_params, flavor]}
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2 b/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
index 71dbe22b..eb08bc23 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
@@ -120,6 +120,10 @@ disable_service horizon
 [DEFAULT]
 global_physnet_mtu = 1442
 
+[baremetal_agent]
+enable_ha_chassis_group_alignment = False
+enable_router_ha_binding_events = True
+
 [baremetal_l2vni]
 # Set to False for pure EVPN deployments where switches handle VXLAN via BGP
 # Set to True if you need OVN localnet ports for overlay-to-physical bridging