For moms that swaddle or did swaddle their babies for bedtime, what was the best way for you to transition them once they started rolling and you could no longer swaddle them at night?

We are almost to the point where I’m getting uneasy swaddling at night because he’s starting to roll onto his side so any day now he will be rolling. But he sleeps so well swaddled! We tried not swaddling him and he didn’t sleep very well. So just curious what you guys have done for the transition!