Additional EC2 overrides