Autopilot breaking after Win 11 upgrade.

Currently in the middle of a mass upgrade on our W10 machines to migrate them to W11. Seems that we're having to delete the hashes from autopilot devices and re-add them with get-windowsautopilotinfo -online :/ If we don't remove and re-add the enrollment profile never loads

Feeling like this defeats the purpose of autopilot... Am I doing something wrong? Currently hybrid environment where machines get a random name after enrollment if that matters.