Swaddle help

mamabear

My son loves being swaddled and is not ready to stop however he is trying to roll over now😩. My issue is that when his hands are free from the swaddle he scratched his face and digs in his eyes and I’m terrified he’s going to hurt them. Anyone else or any advice?