I keep with routine... P set it himself and if you don't follow it he gets cranky and thrown off
When we get home if he wakes I just put him straight into bed and give him a goodnight kiss and off he goes