Transitioning from swaddle

Abby

So my 2 1/2 month old baby is so stinking strong and is almost rolling over from his back to his stomach (already rolls over from his stomach to back) and tries to in his sleep as well! We currently keep him swaddled at night with one arm out (and sometimes breaks his other arm out somehow and wakes up) , but I’m nervous for him to roll over if he’s swaddled. He still has his Moro Relfex and startles himself awake when he naps during the day so I’m hesitant to switch to a sleep sack/wearable blanket quite yet because I don’t want him startling himself and waking up. Any advice would be amazing!! ❤️