NXP-10857: fix template fetching error - refactor descriptor/service