[CloudFormation] Improve resources

Per @trevorrowe’s comment: http://git.io/rx3KYg