Update roles to make them more docker-friendly