Sleep situation 12 weeks

What does or did your 12 week olds sleep set up look like. I’ve had THE BEST sleeper for 12 weeks in the swaddle & bassinet but now she’s trying to roll and is pretty freakin close. I feel horrible swaddling her at night and am waking every hour now panicky thinking I’m gonna wake with her face down. She’s constantly practicing rolling anytime she’s on her back and I can tell she really wants to. No sleep sack is working for us .. not the Merlin not the dream transition one, nothing. Please show pics of your sleep set up if you have one! And any tips for transitioning out of the swaddle appreciated