Swaddle Transition

My LO is 4.5 months old, she just started rolling from tummy to back and will now occasionally prop herself up on her side. I had been planning on working on transitioning her from her swaddle very soon anyway. However, just before she was able to roll to her side, she would get her arms free and wake up only to be swaddled back. I now can not get her to go to sleep for more than 15-20 minutes with out a swaddle. What tips/transition swaddles did you try? I'm up for any recommendations! TIA