Stop swaddling?

My baby boy loves to be swaddled. However, he is becoming more active. I woke up this morning and his head was at the foot of his bassinet and he was lying on his side 😳 He smiles and coos every time I swaddle him at night and for naps😍 I know it’s not safe for them to be swaddled once they get more active and start rolling. Any tips on how to transition him? I’m trying swaddling with one arm out hoping he will be okay with that but u don’t want to lose the 6-8 hour sleep stretches we have been getting at night 🤞🏼