Rejiggering setup to use only ec2_roles