A User Plane Function (UPF) of 5G Core network performs a search for the next hop in the data path, using utilities (e.g., Internet Control Message Protocol (ICMP) traceroute), and determines the capability of the next router and/or other hops in the path. The UPF updates (e.g., using the PATCH command) the Network Repository Function (NRF) with the gathered information. The UPF also updates the NRF the UPF's position in the current route, and the role(s) the UPF is playing at a given time, e.g., Branching Point (BP), Intermediate User Plane Function (I-UPF), and the like. The SMF is enabled to identify the UPF's capability for a given PDU Session. The selection of a given UPF for non-suitable roles can be prevented, and the UPF can be selected for those roles in which the UPF is more suitable at a given time.