diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/TROUBLESHOOTING.md b/scenarios/networking-lab/devstack-nxsw-vxlan/TROUBLESHOOTING.md
index cd9023d6..b2737978 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/TROUBLESHOOTING.md
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/TROUBLESHOOTING.md
@@ -1,8 +1,9 @@
 # Troubleshooting Guide: Cisco NX-OS VXLAN EVPN
 
-This guide provides useful Cisco NX-OS commands for troubleshooting the spine-and-leaf VXLAN EVPN topology.
+This guide provides useful Cisco NX-OS commands for troubleshooting the spine-and-leaf VXLAN EVPN topology, as well as packet capture techniques for debugging network connectivity.
 
 ## Table of Contents
+- [Packet Capture and Traffic Analysis](#packet-capture-and-traffic-analysis)
 - [BGP EVPN Control Plane](#bgp-evpn-control-plane)
 - [VXLAN Overlay](#vxlan-overlay)
 - [VLAN Configuration](#vlan-configuration)
@@ -12,6 +13,122 @@ This guide provides useful Cisco NX-OS commands for troubleshooting the spine-an
 - [Port Configuration](#port-configuration)
 - [General System Information](#general-system-information)
 
+## Packet Capture and Traffic Analysis
+
+### Devstack Node - Monitoring ARP Traffic
+
+Monitor ARP traffic on the devstack node to troubleshoot connectivity between the overcloud and baremetal nodes.
+
+#### Monitor ARP on br-ex (OVS Bridge)
+```bash
+stack@devstack:~$ sudo tcpdump -i br-ex -envv arp
+```
+Shows ARP traffic on the OVS external bridge. You should see VLAN-tagged ARP requests from baremetal nodes coming in, and ARP replies from the router going out.
+
+**Expected output:**
+```
+22:dd:04:01:1b:08 > ff:ff:ff:ff:ff:ff, ethertype 802.1Q (0x8100), length 78: vlan 103, p 0, ethertype ARP (0x0806), Request who-has 10.0.5.1 tell 10.0.5.87
+fa:16:3e:12:24:7c > 22:dd:04:01:1b:08, ethertype 802.1Q (0x8100), length 78: vlan 103, p 0, ethertype ARP (0x0806), Reply 10.0.5.1 is-at fa:16:3e:12:24:7c
+```
+
+#### Monitor ARP on trunk0 (Physical Interface)
+```bash
+stack@devstack:~$ sudo tcpdump -i trunk0 -envv arp
+```
+Shows ARP traffic on the physical trunk interface that connects to leaf01. This helps verify if packets are actually leaving/entering the physical interface with correct VLAN tags.
+
+**What to look for:**
+- **Ingress**: ARP requests from baremetal nodes should arrive with VLAN tags
+- **Egress**: ARP replies from router should leave with VLAN tags
+- If you see traffic on br-ex but NOT on trunk0, there's an OVS flow issue
+- If VLAN tags are present on trunk0 but missing when they arrive at the switch, there's an undercloud Neutron trunk issue
+
+#### Monitor All Traffic on trunk0
+```bash
+stack@devstack:~$ sudo tcpdump -i trunk0 -envv
+```
+Shows all traffic including STP, LLDP, and data packets. Useful for verifying physical connectivity.
+
+### Cisco Switch - Monitoring Traffic
+
+Monitor traffic on Cisco NX-OS switches using the built-in ethanalyzer tool.
+
+#### Monitor ARP on a Specific Interface
+```bash
+leaf01# ethanalyzer local interface front-panel eth1/3 display-filter arp
+leaf01# ethanalyzer local interface front-panel eth1/4 display-filter arp
+```
+Captures and displays ARP traffic on the specified front-panel interface (e.g., Ethernet1/3, Ethernet1/4).
+
+**Expected output:**
+```
+2026-03-17 23:16:05.641404 fa:16:3e:12:24:7c -> 22:dd:04:01:1b:08 ARP 10.0.5.1 is at fa:16:3e:12:24:7c
+```
+
+**What to check:**
+- Are ARP packets arriving at the switch?
+- Are VLAN tags present or stripped?
+- Is bidirectional ARP traffic visible (both requests and replies)?
+
+#### Monitor All Traffic on an Interface
+```bash
+leaf01# ethanalyzer local interface front-panel eth1/3
+```
+Shows all traffic including STP, ARP, and data packets. Press Ctrl+C to stop.
+
+#### Limit Number of Packets Captured
+```bash
+leaf01# ethanalyzer local interface front-panel eth1/3 limit-captured-frames 20
+```
+Captures only 20 frames and then stops automatically.
+
+#### Monitor Specific Protocol
+```bash
+# Monitor only ICMP traffic
+leaf01# ethanalyzer local interface front-panel eth1/3 display-filter icmp
+
+# Monitor only IPv4 traffic
+leaf01# ethanalyzer local interface front-panel eth1/3 display-filter ip
+```
+
+### Debugging VLAN Tag Issues
+
+If you suspect VLAN tags are being stripped or not applied correctly:
+
+1. **On devstack, capture on trunk0:**
+   ```bash
+   sudo tcpdump -i trunk0 -envv 'vlan 103'
+   ```
+   Verify that outbound traffic has VLAN tags
+
+2. **On leaf01, capture on the corresponding interface:**
+   ```bash
+   ethanalyzer local interface front-panel eth1/4 display-filter arp
+   ```
+   Check if the same traffic arrives with or without tags
+
+3. **Compare**:
+   - If traffic leaves trunk0 tagged but arrives at the switch untagged → undercloud Neutron trunk issue
+   - If traffic doesn't leave trunk0 at all → OVS flow issue on devstack
+   - If traffic arrives tagged but isn't forwarded → switch VLAN configuration issue
+
+### Check MAC Learning on Switches
+
+After seeing ARP traffic, verify that the switches learned the MAC addresses:
+
+```bash
+# Check specific VLAN
+show mac address-table vlan 103
+
+# Check specific interface
+show mac address-table interface ethernet 1/3
+```
+
+If MAC addresses aren't being learned, check:
+- Interface is in correct VLAN
+- VLAN exists in NVE peer list
+- BGP EVPN is advertising the routes
+
 ## BGP EVPN Control Plane
 
 ### Check BGP EVPN Session Status
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/automation-vars.yml b/scenarios/networking-lab/devstack-nxsw-vxlan/automation-vars.yml
index 6e00064c..042a098e 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/automation-vars.yml
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/automation-vars.yml
@@ -32,7 +32,7 @@ stages:
         exit 1
       fi
 
-      ssh -o StrictHostKeyChecking=no stack@devstack.netlab.example.com "
+      ssh -o StrictHostKeyChecking=no stack@devstack.stack.lab "
         ROUTES=\$(ip -j r)
         ROUTE_EXISTS=\$(echo \"\$ROUTES\" | python3 -c '
       import sys, json
@@ -102,28 +102,15 @@ stages:
       Transitions nodes from 'enroll' to 'manageable' state. This validates
       basic hardware connectivity and prepares nodes for further operations.
     shell: |
-      set -xe -o pipefail
+      set -x -o pipefail
 
       # Get list of node UUIDs
       node_uuids=$(openstack --os-cloud devstack-admin baremetal node list -f value -c UUID)
 
-      # Manage each node
+      # Manage each node with --wait (300 second timeout)
       for uuid in $node_uuids; do
         echo "Managing node: $uuid"
-        openstack --os-cloud devstack-admin baremetal node manage $uuid
-      done
-
-      # Wait for manageable state
-      counter=0
-      max_retries=60
-      until ! openstack --os-cloud devstack-admin baremetal node list -f value -c "Provisioning State" | grep -v "manageable"; do
-        ((counter++))
-        if (( counter > max_retries )); then
-          echo "ERROR: Timeout waiting for nodes to reach manageable state"
-          openstack --os-cloud devstack-admin baremetal node list
-          exit 1
-        fi
-        sleep 5
+        openstack --os-cloud devstack-admin baremetal node manage --wait 300 $uuid
       done
 
       echo "All nodes successfully reached manageable state"
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
index ec9cdbfb..b8147d62 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/heat_template.yaml
@@ -37,7 +37,7 @@ parameters:
     type: json
     default:
       image: ubuntu-noble-server
-      flavor: hotstack.xxlarge
+      flavor: hotstack.large
   ironic_params:
     type: json
     default:
@@ -123,63 +123,33 @@ resources:
       port_security_enabled: false
       value_specs: {get_param: net_value_specs}
 
-  # Leaf01 trunk networks for tenant VLANs
+  # Trunk network for leaf01 switch
   leaf01-trunk-net:
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       value_specs: {get_param: net_value_specs}
 
-  leaf01-public-vlan100:
-    type: OS::Neutron::Net
-    properties:
-      port_security_enabled: false
-      value_specs: {get_param: net_value_specs}
-
-  leaf01-tenant-vlan103:
-    type: OS::Neutron::Net
-    properties:
-      port_security_enabled: false
-      value_specs: {get_param: net_value_specs}
-
-  leaf01-tenant-vlan104:
-    type: OS::Neutron::Net
-    properties:
-      port_security_enabled: false
-      value_specs: {get_param: net_value_specs}
-
-  leaf01-tenant-vlan105:
-    type: OS::Neutron::Net
-    properties:
-      port_security_enabled: false
-      value_specs: {get_param: net_value_specs}
-
-  # Leaf02 trunk networks for tenant VLANs
-  leaf02-trunk-net:
-    type: OS::Neutron::Net
-    properties:
-      port_security_enabled: false
-      value_specs: {get_param: net_value_specs}
-
-  leaf02-public-vlan100:
+  # Shared VLAN networks for physical network connectivity
+  public-vlan100:
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       value_specs: {get_param: net_value_specs}
 
-  leaf02-tenant-vlan103:
+  tenant-vlan103:
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       value_specs: {get_param: net_value_specs}
 
-  leaf02-tenant-vlan104:
+  tenant-vlan104:
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
       value_specs: {get_param: net_value_specs}
 
-  leaf02-tenant-vlan105:
+  tenant-vlan105:
     type: OS::Neutron::Net
     properties:
       port_security_enabled: false
@@ -270,7 +240,7 @@ resources:
       enable_dhcp: false
       gateway_ip: null
 
-  # Leaf01 trunk subnets
+  # Leaf01 trunk subnet
   leaf01-trunk-subnet:
     type: OS::Neutron::Subnet
     properties:
@@ -278,94 +248,45 @@ resources:
       ip_version: 4
       cidr: 172.20.20.0/24
       enable_dhcp: false
-      allocation_pools:
-        - start: 172.20.20.100
-          end: 172.20.20.150
+      gateway_ip: null
 
-  leaf01-public-vlan100-subnet:
+  # Shared VLAN subnets
+  public-vlan100-subnet:
     type: OS::Neutron::Subnet
     properties:
-      network: {get_resource: leaf01-public-vlan100}
+      network: {get_resource: public-vlan100}
       ip_version: 4
       cidr: 172.20.0.0/24
       gateway_ip: 172.20.0.1
       enable_dhcp: false
 
-  leaf01-tenant-vlan103-subnet:
+  tenant-vlan103-subnet:
     type: OS::Neutron::Subnet
     properties:
-      network: {get_resource: leaf01-tenant-vlan103}
+      network: {get_resource: tenant-vlan103}
       ip_version: 4
       cidr: 172.20.3.0/24
       gateway_ip: null
       enable_dhcp: false
 
-  leaf01-tenant-vlan104-subnet:
+  tenant-vlan104-subnet:
     type: OS::Neutron::Subnet
     properties:
-      network: {get_resource: leaf01-tenant-vlan104}
+      network: {get_resource: tenant-vlan104}
       ip_version: 4
       cidr: 172.20.4.0/24
       gateway_ip: null
       enable_dhcp: false
 
-  leaf01-tenant-vlan105-subnet:
+  tenant-vlan105-subnet:
     type: OS::Neutron::Subnet
     properties:
-      network: {get_resource: leaf01-tenant-vlan105}
+      network: {get_resource: tenant-vlan105}
       ip_version: 4
       cidr: 172.20.5.0/24
       gateway_ip: null
       enable_dhcp: false
 
-  # Leaf02 trunk subnets
-  leaf02-trunk-subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: {get_resource: leaf02-trunk-net}
-      ip_version: 4
-      cidr: 172.20.21.0/24
-      enable_dhcp: false
-      allocation_pools:
-        - start: 172.20.21.100
-          end: 172.20.21.150
-
-  leaf02-public-vlan100-subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: {get_resource: leaf02-public-vlan100}
-      ip_version: 4
-      cidr: 172.20.1.0/24
-      gateway_ip: 172.20.1.1
-      enable_dhcp: false
-
-  leaf02-tenant-vlan103-subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: {get_resource: leaf02-tenant-vlan103}
-      ip_version: 4
-      cidr: 172.20.6.0/24
-      gateway_ip: null
-      enable_dhcp: false
-
-  leaf02-tenant-vlan104-subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: {get_resource: leaf02-tenant-vlan104}
-      ip_version: 4
-      cidr: 172.20.7.0/24
-      gateway_ip: null
-      enable_dhcp: false
-
-  leaf02-tenant-vlan105-subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      network: {get_resource: leaf02-tenant-vlan105}
-      ip_version: 4
-      cidr: 172.20.8.0/24
-      gateway_ip: null
-      enable_dhcp: false
-
   #
   # Routers
   #
@@ -425,12 +346,12 @@ resources:
               str_replace:
                 template: |
                   # Host records
-                  host-record=controller-0.netlab.example.com,$controller0
-                  host-record=spine01.netlab.example.com,$spine01
-                  host-record=spine02.netlab.example.com,$spine02
-                  host-record=leaf01.netlab.example.com,$leaf01
-                  host-record=leaf02.netlab.example.com,$leaf02
-                  host-record=devstack.netlab.example.com,$devstack
+                  host-record=controller-0.stack.lab,$controller0
+                  host-record=spine01.stack.lab,$spine01
+                  host-record=spine02.stack.lab,$spine02
+                  host-record=leaf01.stack.lab,$leaf01
+                  host-record=leaf02.stack.lab,$leaf02
+                  host-record=devstack.stack.lab,$devstack
                 params:
                   $controller0: {get_attr: [controller-machine-port, fixed_ips, 0, ip_address]}
                   $spine01: {get_attr: [spine01-machine-port, fixed_ips, 0, ip_address]}
@@ -698,28 +619,28 @@ resources:
   leaf01-trunk-public-vlan100-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-public-vlan100}
+      network: {get_resource: public-vlan100}
       port_security_enabled: false
       mac_address: "22:57:f8:dd:03:06"
 
   leaf01-trunk-tenant-vlan103-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan103}
+      network: {get_resource: tenant-vlan103}
       port_security_enabled: false
       mac_address: "22:57:f8:dd:03:07"
 
   leaf01-trunk-tenant-vlan104-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan104}
+      network: {get_resource: tenant-vlan104}
       port_security_enabled: false
       mac_address: "22:57:f8:dd:03:08"
 
   leaf01-trunk-tenant-vlan105-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan105}
+      network: {get_resource: tenant-vlan105}
       port_security_enabled: false
       mac_address: "22:57:f8:dd:03:09"
 
@@ -741,12 +662,12 @@ resources:
           segmentation_id: 105
           segmentation_type: vlan
 
-  leaf01-ironic0-br-port:
+  leaf02-ironic0-br-port:
     type: OS::Neutron::Port
     properties:
       network: {get_resource: ironic0-br-net}
       port_security_enabled: false
-      mac_address: "22:57:f8:dd:03:0a"
+      mac_address: "22:57:f8:dd:04:0a"
 
   leaf01:
     type: OS::Nova::Server
@@ -760,7 +681,6 @@ resources:
         - port: {get_resource: leaf01-spine01-port}
         - port: {get_resource: leaf01-spine02-port}
         - port: {get_attr: [leaf01-trunk, port_id]}
-        - port: {get_resource: leaf01-ironic0-br-port}
         - port: {get_resource: leaf01-devstack-br-port}
 
   # Leaf02 Switch
@@ -805,59 +725,6 @@ resources:
       port_security_enabled: false
       mac_address: "22:57:f8:dd:04:03"
 
-  leaf02-trunk-parent-port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: leaf02-trunk-net}
-      port_security_enabled: false
-      mac_address: "22:57:f8:dd:04:04"
-
-  leaf02-trunk-public-vlan100-port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: leaf02-public-vlan100}
-      port_security_enabled: false
-      mac_address: "22:57:f8:dd:04:05"
-
-  leaf02-trunk-tenant-vlan103-port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: leaf02-tenant-vlan103}
-      port_security_enabled: false
-      mac_address: "22:57:f8:dd:04:06"
-
-  leaf02-trunk-tenant-vlan104-port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: leaf02-tenant-vlan104}
-      port_security_enabled: false
-      mac_address: "22:57:f8:dd:04:07"
-
-  leaf02-trunk-tenant-vlan105-port:
-    type: OS::Neutron::Port
-    properties:
-      network: {get_resource: leaf02-tenant-vlan105}
-      port_security_enabled: false
-      mac_address: "22:57:f8:dd:04:08"
-
-  leaf02-trunk:
-    type: OS::Neutron::Trunk
-    properties:
-      port: {get_resource: leaf02-trunk-parent-port}
-      sub_ports:
-        - port: {get_resource: leaf02-trunk-public-vlan100-port}
-          segmentation_id: 100
-          segmentation_type: vlan
-        - port: {get_resource: leaf02-trunk-tenant-vlan103-port}
-          segmentation_id: 103
-          segmentation_type: vlan
-        - port: {get_resource: leaf02-trunk-tenant-vlan104-port}
-          segmentation_id: 104
-          segmentation_type: vlan
-        - port: {get_resource: leaf02-trunk-tenant-vlan105-port}
-          segmentation_id: 105
-          segmentation_type: vlan
-
   leaf02-ironic1-br-port:
     type: OS::Neutron::Port
     properties:
@@ -876,7 +743,7 @@ resources:
         - port: {get_resource: leaf02-machine-port}
         - port: {get_resource: leaf02-spine01-port}
         - port: {get_resource: leaf02-spine02-port}
-        - port: {get_attr: [leaf02-trunk, port_id]}
+        - port: {get_resource: leaf02-ironic0-br-port}
         - port: {get_resource: leaf02-ironic1-br-port}
 
   #
@@ -902,7 +769,7 @@ resources:
     properties:
       cloud_config:
         hostname: devstack
-        fqdn: devstack.netlab.example.com
+        fqdn: devstack.stack.lab
 
 
   devstack-write-files:
@@ -948,25 +815,25 @@ resources:
   devstack-public-vlan100-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-public-vlan100}
+      network: {get_resource: public-vlan100}
       port_security_enabled: false
 
   devstack-tenant-vlan103-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan103}
+      network: {get_resource: tenant-vlan103}
       port_security_enabled: false
 
   devstack-tenant-vlan104-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan104}
+      network: {get_resource: tenant-vlan104}
       port_security_enabled: false
 
   devstack-tenant-vlan105-port:
     type: OS::Neutron::Port
     properties:
-      network: {get_resource: leaf01-tenant-vlan105}
+      network: {get_resource: tenant-vlan105}
       port_security_enabled: false
 
   devstack-trunk:
@@ -1104,21 +971,6 @@ outputs:
             dhcp6: false
             set-name: trunk0
             mtu: 1442
-        vlans:
-          trunk0.100:
-            id: 100
-            link: trunk0
-            mtu: 1442
-            dhcp4: false
-            addresses:
-              - list_join:
-                  - ''
-                  - - {get_attr: [devstack-public-vlan100-port, fixed_ips, 0, ip_address]}
-                    - '/'
-                    - str_split:
-                        - '/'
-                        - {get_attr: [devstack-public-vlan100-port, subnets, 0, cidr]}
-                        - 1
 
   sushy_emulator_uuids:
     description: UUIDs of instances to manage with sushy-tools - RedFish virtual BMC
@@ -1140,7 +992,7 @@ outputs:
           boot_interface: redfish-virtual-media
           network_interface: neutron
           driver_info:
-            redfish_address: http://controller-0.netlab.example.com:8000
+            redfish_address: http://controller-0.stack.lab:8000
             redfish_system_id:
               str_replace:
                 template: "/redfish/v1/Systems/$SYS_ID"
@@ -1158,16 +1010,16 @@ outputs:
             - address: {get_attr: [ironic0-port, mac_address]}
               physical_network: public
               local_link_connection:
-                switch_info: leaf01.netlab.example.com
-                switch_id: "22:57:f8:dd:03:01"
-                port_id: "ethernet1/4"
+                switch_info: leaf02.stack.lab
+                switch_id: "22:57:f8:dd:04:01"
+                port_id: "ethernet1/3"
         - name: ironic1
           driver: redfish
           bios_interface: no-bios
           boot_interface: redfish-virtual-media
           network_interface: neutron
           driver_info:
-            redfish_address: http://controller-0.netlab.example.com:8000
+            redfish_address: http://controller-0.stack.lab:8000
             redfish_system_id:
               str_replace:
                 template: "/redfish/v1/Systems/$SYS_ID"
@@ -1185,7 +1037,7 @@ outputs:
             - address: {get_attr: [ironic1-port, mac_address]}
               physical_network: public
               local_link_connection:
-                switch_info: leaf02.netlab.example.com
+                switch_info: leaf02.stack.lab
                 switch_id: "22:57:f8:dd:04:01"
                 port_id: "ethernet1/4"
 
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/l2vni_network_nodes.yaml b/scenarios/networking-lab/devstack-nxsw-vxlan/l2vni_network_nodes.yaml
index 3b2a7fb6..ec4a4f33 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/l2vni_network_nodes.yaml
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/l2vni_network_nodes.yaml
@@ -10,7 +10,10 @@ network_nodes:
   - hostname: "devstack"
     trunks:
       - physical_network: public
-        local_link_connection:
-          switch_id: "22:57:f8:dd:03:01"
-          port_id: "Ethernet1/5"
-          switch_info: "leaf01.netlab.example.com"
+        local_link_information:
+          - switch_id: "22:57:f8:dd:03:01"
+            port_id: "Ethernet1/3"
+            switch_info: "leaf01.stack.lab"
+          - switch_id: "22:57:f8:dd:03:01"
+            port_id: "Ethernet1/5"
+            switch_info: "leaf01.stack.lab"
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/leaf01-poap.cfg b/scenarios/networking-lab/devstack-nxsw-vxlan/leaf01-poap.cfg
index 6b02a5e7..585b096c 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/leaf01-poap.cfg
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/leaf01-poap.cfg
@@ -1,4 +1,4 @@
-hostname leaf01.netlab.example.com
+hostname leaf01.stack.lab
 vdc leaf01 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096
@@ -59,22 +59,17 @@ interface Ethernet1/2
   no shutdown
 
 interface Ethernet1/3
-  description "Trunk port for VLANs 100,103-105 - managed by ML2"
+  description "Trunk port for VLANs - managed by ML2"
   switchport mode trunk
-  switchport trunk allowed vlan 100,103-105
+  switchport trunk allowed vlan none
   mtu 1442
+  spanning-tree port type edge trunk
   no shutdown
 
 interface Ethernet1/4
-  description "Ironic0 access port - managed by ML2"
-  mtu 1442
-  spanning-tree port type edge
-  shutdown
-
-interface Ethernet1/5
-  description "Devstack connection to br-ex - trunk for dynamic VLANs"
+  description "Devstack connection to br-ex - managed by ML2"
   switchport mode trunk
-  switchport trunk allowed vlan 103-105
+  switchport trunk allowed vlan none
   mtu 1442
   spanning-tree port type edge trunk
   no shutdown
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/leaf02-poap.cfg b/scenarios/networking-lab/devstack-nxsw-vxlan/leaf02-poap.cfg
index d1b61b8f..46aabba0 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/leaf02-poap.cfg
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/leaf02-poap.cfg
@@ -1,4 +1,4 @@
-hostname leaf02.netlab.example.com
+hostname leaf02.stack.lab
 vdc leaf02 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096
@@ -59,12 +59,10 @@ interface Ethernet1/2
   no shutdown
 
 interface Ethernet1/3
-  description "Trunk port for VLANs 100,103-105 - managed by ML2"
-  switchport mode trunk
-  switchport trunk allowed vlan 100,103-105
+  description "Ironic0 access port - managed by ML2"
   mtu 1442
-  spanning-tree port type edge trunk
-  no shutdown
+  spanning-tree port type edge
+  shutdown
 
 interface Ethernet1/4
   description "Ironic1 access port - managed by ML2"
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2 b/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
index 1f753795..71dbe22b 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/local.conf.j2
@@ -29,7 +29,7 @@ PUBLIC_NETWORK_GATEWAY=172.20.200.1
 IP_VERSION=4
 
 # Enable Neutron with OVN
-enable_plugin neutron https://opendev.org/openstack/neutron
+NEUTRON_BRANCH=refs/changes/37/980637/1
 disable_service n-net
 enable_service q-svc
 # Disable traditional neutron agents
@@ -103,10 +103,10 @@ OVN_BRIDGE_MAPPINGS=public:br-ex
 enable_plugin ironic https://opendev.org/openstack/ironic
 
 # Enable networking-generic-switch plugin
-enable_plugin networking-generic-switch https://opendev.org/openstack/networking-generic-switch
+enable_plugin networking-generic-switch https://opendev.org/openstack/networking-generic-switch refs/changes/62/981262/2
 
 # Enable networking-baremetal plugin
-enable_plugin networking-baremetal https://opendev.org/openstack/networking-baremetal refs/changes/75/980375/2
+enable_plugin networking-baremetal https://opendev.org/openstack/networking-baremetal
 
 
 
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/spine01-poap.cfg b/scenarios/networking-lab/devstack-nxsw-vxlan/spine01-poap.cfg
index 4e2b5854..d510ead1 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/spine01-poap.cfg
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/spine01-poap.cfg
@@ -1,4 +1,4 @@
-hostname spine01.netlab.example.com
+hostname spine01.stack.lab
 vdc spine01 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096
diff --git a/scenarios/networking-lab/devstack-nxsw-vxlan/spine02-poap.cfg b/scenarios/networking-lab/devstack-nxsw-vxlan/spine02-poap.cfg
index 1bb9968b..b0118ac8 100644
--- a/scenarios/networking-lab/devstack-nxsw-vxlan/spine02-poap.cfg
+++ b/scenarios/networking-lab/devstack-nxsw-vxlan/spine02-poap.cfg
@@ -1,4 +1,4 @@
-hostname spine02.netlab.example.com
+hostname spine02.stack.lab
 vdc spine02 id 1
   limit-resource vlan minimum 16 maximum 4094
   limit-resource vrf minimum 2 maximum 4096