Modifying to support environment variables and new AMI images