Swappable boot drives with Intune

I have a situation where multiple users get hard drives assigned to them to use in our classroom lab PCs that have drive trays where they insert their assigned drive. I have been testing how Intune handles the new drive being inserted.

When the first drive is built from the on-prem deployment system, it is recognized by Intune and all is well. When the second student arrives and builds their drive, all is well. The problem arises when the first student comes back to boot their drive. Intune flags it as non-compliant and will not pull new policy. They can still use the machine but Intune freaks out a bit. When the second drive comes back, all is well again in Intune.

I realize this is a strange scenario, but I thought someone might have a clever idea of how to get Intune to recognize both builds as compliant. I'm not sure if this is just the way it registers the hardware IDs or if I'm fighting a number of issues because this is not what it is designed for.