Transitioning from swaddle?

Esther • I’m better than horrible. EMT and Respiratory Therapist

My baby is 3 months old and has started to roll from tummy to back. I know back to tummy is on the horizon. I’ve also noticed that he fights when I put him in his swaddle sack now. But he won’t sleep through the night if his arms aren’t in it! Every time I’ve tried he wakes up after a few hours and then won’t go back down unless his arms are swaddled again. Has anyone been through this?