Systems and approaches are provided for optimizing the Spanning Tree Protocol (STP) in a switched network. STP port type for a network infrastructure device can be controlled based on the dynamically discovered neighbor device type of the directly connected peer of the device using the Link Level Discovery Protocol (LLDP). LLDP can provide system capabilities of a link level peer to identify whether the link level peer is a host or a network infrastructure device. In various embodiments, the exchange of system capabilities can the trigger the configuration of an STP port as a network port for ports connected to network infrastructure devices or edge ports for ports directly connected to host devices.