breaking my 3 month old from swaddling

It's so tough guys!!!! My little man was sleeping from 8pm till 7am for WEEKS! And now that he's started to roll onto his side they say it's unsafe so we are trying to break him of swaddling and he's now waking up 1-2 times a night for a bottle again! We have just his arms out and still have it tight around his belly for comfort but it doesn't help all that much 😩 any advice or tips that worked for you guys?