Add job-group to correctly expand macros