Autopilot Custom tags

Hi, is there a way to add some information, aside from group tags which we already use to put devices in different groups, so that we can specify for example, the name of the VM that we're using to test AP scenarios?

Asking, because we have a lot of VMs and we create new ones and it's hard to remember which hash belongs to which VMs.

We can have an external list, but if we do HAAD, could we have the 'Device Name' attribute since I think it's only used for AAD scenarios?

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