Baby won’t sleep with arms out

My LO will only sleep with her arms swaddled. This would be okay except for the fact that she’s recently started rolling. If I leave her arms out she flails and wakes herself up. She wakes up every 45 minutes - 2 hours so mom and dad are not getting good sleep. Any suggestions on how to transition from swaddling??