There are provided measures for optimization of network function profile administration and discovery. Such measures exemplarily comprise, at a network entity in a network entity composition, transmitting, towards a network repository function, a network entity registration request including an identifier of said network entity, an identifier of said network entity composition, and network entity specific attributes of said network entity, and receiving a network entity registration response indicative of a result of said network entity registration request.