ec2 - Updating for infra changes