Advance Passenger Info and dual citizenship - are airlines working on this?

Less "aviation in general" and more "commercial air*lines*" so apologies if there's a better sub than this, but I can't find one and I think it's relevant. So, the US I94 system is now fully digital and just pulls data from the APIS info supplied by the passengers in their bookings (or from the passport scans during check in if pax don't do this). This was broadly fine while it was only the US running this kind of system. Canada has also had an ETA scheme for several years, the UK has now joined, and now the entire Schengen zone is going to be doing the same thing with ETIAS. For those of us with dual nationalities this now causes a major headache: the USA, Canada, and the UK all *require* their citizens to enter on their passport for that country if they have one; but check-in is only possible if a passport shows up as being valid in the systems of the destination country. This, for instance, means that a US/UK dual citizen has to enter their US passport in to their airline booking but wouldn't be able to check in for a flight to the UK because no UKETA is associated with that passport. This'll expand significantly with ETIAS, and the combos of problematic dual nationalities will are only going to increase. So, my question: are airlines actually doing something about this? We know that airline IT is usually antiquiated AF, and culturally most airlines seem to view IT as a pesky cost centre rather than something they should proactively invest in. To me though this looks like a time bomb with a very short fuse, and those of us with dual citizenships need to be able to specify this as being the case when travelling between jurisdictions with digital borders. Is anyone with insider knowledge able to share some insight? Even if that insight is "I'm the CTO of an airline and I hadn't considered this"!