Rolling and swaddle?!

Any one know the rules for swaddling? My little one rolls from belly to back, but not back to belly. She will be 15 weeks Monday. We did a one arm out swaddle for a week and then she rolled for the first time belly to back, so she’s in a halo sleep sack now. She was sleeping 10+ hours and is now awake every couple hours but is usually soothed with her pacifier. Any suggestions? Can I still safely swaddle one arm out for a little longer to help transition? I’ve thought about the zipadee zip transition swaddle but I wasn’t sure if it was with it.