Bring main.yml to latest fully functional version