Switch to NPS Bootstrap and work a bit on migration