Updated environment config and aws