Correct bundle configuration and service definitions

:sweat_smile:

Tested integration in Gateway. Bamp to 2.1? :disappointed: