BS-2239 isolate and update a tenant