FTM rolling over?

Cassondra

My son barely rolled over for the first time he’s 11 weeks but he can’t do it when laying on his back. Only time he can do it is when doing tummy time. Should I stop swaddling him already? Or is he ok until he learns how to roll being on his back? If I need to stop what do you put them in at night? My son has bad arms have to be swaddled because if he doesn’t he gets startled very bad and won’t sleep. Right now I use the miracle blanket.