Hello @aubreymg
I would say the ISA setup is correct.
I did find this in the forum if you are a sole trader.
However, I would recommend seeking guidance from your accountant as I am not an accountant nor bookkeeper.