some changes on CloudFormation templates