LPS-50764 Update templates