Correct Taxation with differing addresses

Hi, I have the following problem:
invoice address within EU and delivery address wihtin EU: correct taxation (including VAT)
invoice address outside EU and delivery address outside EU: correct taxation (no VAT)
BUT:
invoice address outside EU and delivery address wihtin EU: INcorrect taxation (no VAT)
invoice address inside EU and delivery address outside EU: INcorrect taxation (including VAT)

Correct would be a taxation based on the delivery address, because this determines whether we have an export (no VAT) or intra-EU delivery (with VAT). Can you help in making the correct change in case the delivery country is different to the invoice country?

Thanks so much in advance!