I wouldn’t rush to wipe and re-run a bunch of devices through Autopilot just to get the group tags attached, especially if those machines are already enrolled and working fine. Also keep in mind Autopilot v1 isn’t going anywhere anytime soon. If it were me, I’d probably leave the existing devices alone and use Device Preparation policies for new deployments if that's the way you wanted to go.
