18 weeks and swaddle

So I’m just curious as to what other people have done and what’s worked for y’all. My baby is 18 weeks and I’m trying to decide the best way to ease him out of the swaddle. Is it better to do one arm for a little or is it better to rio the band aid off and just unswaddle him all at once? We tried one arm a little while ago and I think I need to try unswaddling him again. He loves to suck on his hands to self soothe and I think maybe once he got used to no swaddle it may help him sleep better? Any advice?