Updates to automate nhib persistence build