Autopilot HAAD reset issue

Question

Hi, I wanted if the only ways to be able to reset an HAAD devices provisionned with Autopilot (local reset), was to either, remove all the device objects (AAD, Intune, Autopilot) and then re-import the device to Autopilot to start over or target the Domain Join device configuration policy to "All Devices" instead of AutoPilot devices only as that would help with the ODJ timeout problems.

Reference:
http://gerryhampsoncm.blogspot.com/2019/07/autopilot-hybrid-issue-resetting-devices.html

Thank you in advance and don't hesitate if you have any questions