Invoice numbers - multiple companies


I’m running invoice ninja 4.5.18 self-hosted. I have the following situation/question:

I would like to manage the invoices for 2 companies under the same VAT number. I could add a second company, but the invoice numbering (when using auto-increment) will be wrong then since the numbering is different for each company.
I could use the same account for both companies, but then I would like to use another invoice template (logo).
Manual numbering would also be an option but then I would need to keep track of the number of the latest invoice which is not really a nice solution for me.
Does anyone have any solution for this?

Thank you for your answers/suggestions

The app supports creating a separate template for the second company.

In the next version of the app we’re adding groups which would probably work better.