Transitioning with Nanit and other brands

So my baby is starting to get to the point that we need to stay working on transitioning out of the swaddle. I am looking at the transition swaddles that still provide some arm support but allow for him to roll safely when he starts to do this. My problem is he still likes his arms contained, but the Nanit