Hana-- I looked above and I noticed that you posted that your little one is 5 months old? If so, it's time to extend the awake time. That's what is throwing a wrench into his sleep. His body can handle a longer awake time.. and at his age it should be 2 hours. Now to do this, you have to do it gradually, in 15 min. increments/2 days. So, extend it to 1 hr 25 mins, and then do the wind down routine for 2 days, and then extend it to 1 hr 40 mins for 2 more days.. and so on.
To extend it, do a little pre-wind down ritual of a neighbour hood carry walk, or slow dancing, or cuddling with a stuffed animal. Something low key. I'm more particular to the neighbourhood carry walk, fresh air always helps.
Then, when you put him into his bed, make sure that he is more awake but drowsy. You want him to settle to sleep in his bed. So try not to wind down too long.
If he wakes up at the 30/45 min. mark, give him a chance to settle on his own, if he doesn't and is very very upset then do pu.pd.
It will take time and patience.. Hope this helps!