Upgrade to use NB8 as building platform