Adding back EC2 discovery and S3 gateway