PLF-5897 : Improve groups configuration