Problems with napping

So my LO is 3 months today!! Yay!! Hes an amazing night sleeper. But he takes horrible naps during the day. I Swaddling him and put him asleep in a dark room with fans on. Hes asleep when we go in there but will only sleep for 15-20 minutes then wake up crying. Hes been fed and had a diaper change. He use to take amazing naps during the day but since he turned 2 months he always wants to sleep on me. Which is fine. But i cant do anything. Once i get up and put him down he wakes right up. Is there anything thing i can change to put him to sleep im his bed?