Should I change my tax location to NJ because of the pandemic?

I've been working from an office in NY, but since the pandemic, I've been working from home in NJ.  I use a company laptop and connect to a network via VPN.  Every year, in my NJ taxes, I take a tax credit for taxes paid to NY.  For 2020, do I still owe my taxes in NY, or is my income for most of the year really owed to NJ?

Would NJ consider that my tax really belongs to NJ (not NY)?  And would NY still consider that my tax really belongs to NY (because the office is in NY, and I hear they tend to be strict about that)?

What about for 2021?  If I expect to work from home from now on, with only occasional trips to the office, should my withholding be for NY or NJ?  If they make it NJ and they decide that we should return to the office, will that cause a problem? What if they return to the office but allow me to continue to wfh at my convenience?  Would it then be legally considered NY income because I'm still associated with that office?