Mommy tips??

My almost 2 month old still needs to be swaddled over night because he stretches way to much and ends up waking himself up 😭 we don’t swaddle during the day and we try to put him to sleep on his bed but he’ll wake himself up 😭 so he sleeps on the swing durning the day. what can I do?? Do I keep swaddling?