I had DS in an ergo cocoon swaddle that had arms clips and when he started rolling I just clipped one arm out and then a few weeks later I popped the other arm out.

He is nearly 11mnths and he still sleeps zipped in his swaddle mainly as a comfort and he is a mover when he sleeps and during the colder months it was the only way to keep a sheet on him!