Baby likes to be swaddled but is almost rolling?

Hmschultz

DS is 8 weeks and 2 days last night he was in his crib for the third time sleeping and he almost rolled himself over when swaddled and he had also almost wedged himself against the crib.

 

What do we do to transition him from the RNP to the crib when he likes being swaddled? Or how do we transition him from being swaddled in a RNP to unswaddled in a crib? 

We will be going to daycare soon and he will be in a crib there.

 

Thanks!