Rework EC2 config