Set tenant expiry

Change-Id: Id087626afd1cb4775d7f0d55f7c675f47bb124cc