How do i get my baby out of swaddling?

shes almost 5 months old and wont go to sleep unless she is wrapped up really tight, but she has started waking up every hour and unwrapping herself,shes not hungry because she falls back asleep as soon as shes re-wrapped.the poor baby is shattered. ive tried putting her in her gro bag but her arms are still a bit jerky and she wakes herself up every half hour. any suggestions?