Back to work/naps

I’ll be going back to work in the next few weeks after being off for almost 3 months due to Covid-19. My 1 year old usually goes to my mother in laws where he never napped, so he only took 1 nap a day in the morning before he went. When I was off work, he was taking 2 naps a day and it was working really well.

He started really fighting all sleep about a month ago so we decided to try out 1 nap, and he goes down really easily now, so I’m thinking he’s ready for only 1 nap now, whereas before he wasn’t actually ready, he just wasn’t able to nap there.

My problem is, sometimes he only naps for an hour and a half and then is up for 7 hours before bed because it’s impossible get him to go to sleep before 8pm. How do I get him to nap longer? Or should we try going back to 2 naps and see how he does? I’m hoping to get him back on his 1 nap schedule before I go back to work so it’s not a s***show. Advice?