I swaddle both my babies arms still... bc he startles alot

Though, I want to slowly transition him to taking his arms out because he is starting to learn how to roll over..

Any tips on how I could do that?