Change tenant systems to remove vagrant assumptions