Get the star shape swaddles. Those with 2 way zipper. Life saver for me. They would still be able to feel like being swaddled and sleep well while the arms have more movement for them to lift themselves compared to conventional swaddles. I switched mine to this completely when my baby started signs of rolling at 3.5 months. Now at 4.5 months he can roll back and forth on his own while sleeping even when we zip him up. I am still using it because he would scratch his face and head without it and cause scars.
Once the baby learn how to roll, hv to stop swaddle. It's tough in the beginning, my baby could not sleep long without the swaddle. But after a week or so, he get use to it. We started removing swaddle by only swaddle at night for bed. Then alternate night. Then remove it completely.