swaddling 5 month old

Al
Any suggestions for a 5 month old that loves to be swaddled at night but can roll over in both directions. He won't sleep longer than an hour without a swaddle. I know it's not safe anymore for him to be in one in his crib just not sure what to do for him. 
I've tried propping up one side of the mattress and either it's not enough to do anything or half way through the night he slides down onto the flat part 🙈