Older baby Swaddle alternative

My baby boy always loved to be swaddled. We stopped as soon as he started to roll of course. He used to be an amazing sleeper but now sleeps horribly at night and takes super short naps unless he is held. Just to see what happened, i swaddled him up in a blanket for a nap (I stayed with him the whole time). He slept so good! I know it's not at all safe to swaddle a 6 month old so are there any safe sleepers/sleep sacks that kind of mimic a swaddle? Like snug in the middle but arms out and legs able to move? I don't really know whay I'm asking for, I just want some sleep lol