2_role full automation, improvements for AIO