renewal of Z visa , foreign expert certificate

I am Canadian and have a 3 year working Z type and Foreign expert certificate that expires in July (I work in Guangzhou). I have already signed a new 3 year contract with the same company to start after July. What options are there to renew ? ie., can I renew my Z type and foreign expert certificate in China, or would I need to return to Canada ?