Self soothing is killing our sleep

Ta

My girl won’t sleep unless she is swaddled tight. We’ve been super lucky because she’s been sleeping 5-6 hour stretches since 3 weeks. But now that she is self soothing if she wakes up at all she wants her hands and she fights the swaddle so hard grunting and kicking around. She used to just fall right back to sleep if I put my hand on her. Her first stretch of the night is still okay.. we get like 4 hours but after that it’s like every 30 min I have to search for her pacifier and put it back in her mouth or she goes to war with her swaddle 😫 I’ve tried to swaddle with her hands out but then she just slips out her arms and doesn’t sleep at all.