Updated sample topology and tenant values