Baby Rolling Over at Night

I need help! My baby started rolling from back to tummy and we stopped swaddling right after the first time we found him tummy down in bed. Scary! Well now we only swaddle his torso at night and leave his arms out and he rolls on his tummy every hour or two and he gets mad because he can't roll back over and he also can't sleep on his tummy. So I'm having to get up everytime this happens to feed or rock him back to sleep. Any ideas to help baby and me get more sleep at night? This sucks!