Needing some help! FTM so please don’t bag on me!

My daughter has had to sleep swaddled since she was a week old, she’ll flail her arms and wake herself up.

But now I’m running into problems, because she can roll from back to tummy, and rolls to her side in her sleep. So we’ve put her in a zipadee zip so she can move her arms around and everything. And she will not sleep for longer than maybe an hour in it. If we’re lucky.

Any tips on how to help her sleep unswaddled? ☹️