Both times am I applicable for that 72 hr free transit or should I be getting a visa?

I have a Canadian passport. I am travelling from Vancouver to Beijing and then to Osaka, Japan a day and a half later. And then on my way back from Japan I stop again in Beijing and then head back to Canada the following day.