Can I Transition from a Non-B Visa to a BOI Work Permit Without Leaving Thailand?

Hi all, I have a non-B from a Thai company here. There is also a BOI company in the final stages of incorporation that I will be formally hired under. The BOI company is in some ways a sister company to the Thai company that I have my non-B for. My non-B is expiring soon and I'll be here on the amnesty after that. Pre-COVID I would have just left the country for a few days and gotten another non-B but that's not an option right now obviously. I'm finding the information quite difficult to come by. Is there a possibility to transition from the non-B under the Thai company onto a BOI work permit directly or is there another interim visa required? (Meaning a trip out of Thailand). Thanks in advance!