discover-aws will use by default the first private IP of the EC2 instance

Based on the official helm chart for Consul, I'm writing a terraform module to deploy consul in my AWS environment on EC2.

The helm chart runs consul using a statefulset that retains the identity of the node (IP - dataDisk).

I've automated the re-attach of an EBS volume and of an ENI to my instance running in an ASG.

The problem i'm having now is that cloud-join doesn't work anymore because the DescribeInstance will use by default the first IP of the server, interface eth0 i've turned down, instead of eth1 that is the ENI.

I'm aware I can add the IPs to the retry-join conf but this is going to complicate the agent instances discovery of the cluster.

Is there any way I can specify to use a secondary ENI for cloud-join?
What is the recommendation around retaining data disk and IP addresses? Both?
At job-1 I was running consul on ephemeral without retain anything and i've never had issues, but i'd really like to hear what the community and Hashicorp team recommend