Auto update of device hostname in Admin center for unattended clients

Hi all

I am deploying the unattended client to windows 10 devices.  This works great.

If the windows 10 device changes its hostname, then I've noticed that this doesn't update in the admin center or tech console.  These will both show the old hostname.

I reached out to support who state there is no auto update functionality for hostname.  The only fixes are to either reinstall the client or rename the device in the admin center.

Does anyone have a workaround?

I have tried a scripted approach as below but it's not reliable.

1. Install unattended client and save hostname to a file
2. Schedule a check of the current hostname against the recorded hostname in step 1. (Intune remediation policy)
   1. if the hostname is different then reinstall the client using msiexec and repair switches

Thanks