How do I transfer my visa stamp from an old passport to a new one when returning to Thailand?

RE: Transfer visa stamp to new passport

Not sure whether here is the right place to ask for this. My passport is going to expired in another 8 months time. i am thinking to return to my home country and renew the passport and return to Thailand with the new passport (the old passport have my valid non b and re-entry permit).

When i return to Thailand, do i just tell the officer that i am entering with new passport with the visa stamp in my old passport and later go to Cheang Wattana to complete the visa stamp transfer?

any advise is greatly appreciated.