Do you also swaddle them for naps?

I have been holding LO for all his day naps thus far but I know I could potentially be creating a bad habit where he won't nap on his own so I'm going to start laying him in bed. I swaddle him St night or else he'll wake himself up with hid arms. Should I swaddle him for naps?

Oh, he's about 7 weeks old