Fix groups for playbooks