M.H.
I have a similar issue with one of my twins (10 months).
She was a preemie, and it was the only way she would sleep, or get her back to sleep.
I banned swaddling once I read that it can interfere with motor development when continuing beyond infancy. (I'm not really sure that's true, but at the time I got nervous).
So, we set out to teach her to sooth herself.
We put on a little bedtime music, a cute nightlight, and her outfits have long pants and long sleeves, so she's nice and warm when she kicks the blanket off.
After that, she's on her own. In the beginning I had to go back in her room and stroke her face many many times and reposition her. But these days, it's maybe just once. What was a two hour bedtime drama, is now 5-10 minutes.
I dont think there's any instant solution, but this process seemed to go really fast, maybe a week was enough to get things into fairly normal routine.