When is the last date for transitioning to ISO 22000:2018?

We have been certified for ISO 22000:2005 in August 2018.  Our CB insists that we transit to ISO 22000:2018 for the surveillance audit for 2019. What we understand is that till 2021 we can continue with 2005 version? Is it mandatory that we need to transit to 2018 version this year, that is 2019? Can anyone pleas enlighten me on this?  

We have been certified for ISO 22000:2005 in August 2018.  Our CB insists that we transit to ISO 22000:2018 for the surveillance audit for 2019. What we understand is that till 2021 we can continue with 2005 version? Is it mandatory that we need to transit to 2018 version this year, that is 2019? Can anyone pleas enlighten me on this?  

I think a similar query was answered in a recent thread here. I seem to recall there was a "significant" delay reported to be in effect. Perhaps try a little searching if no-one replies.

(Logically the CB should be up-to-date of course).