Openvpn Gateway Switching

[Tobie]

Hi All,
Can anyone assist with the following scenario.
We have an OpenVPN tunnel between 2 firewalls. The client side has 2 x (Upstream) Gateways as follows:

1. WAN Priority ( 8 )
2. Mobile LTE Priority ( 16 )
Allow default gateway switching is turned on.

The tunnel is established using (WAN) when this link fails the default gateway changes to (Mobile LTE) and the tunnel then rebuilds itself over the Mobile LTE.

Now when the (WAN) link is back online the default gateway is automatically changed back to the (WAN) gateway, but the OpenVpn tunnel is still established through the (Mobile LTE).

Is there any way to get OpenVpn to re-establish this tunnel through the WAN gateway now that it is back online again?

Earlier versions of opnsense and pf allowed the OpenVpn configuration to be bound to a failover group object, which worked as expected.

With the current configuration, when the Primary (WAN) link is back online we need to restart tunnels both sides and clear states to force OpenVpn to rebuild the tunnel to the primary gateway.
Thank you !