How to account for OEM windows licensing

The asset auto discover picks up the windows license key automatically. This is great except for that it also picks up the OEM License key for HP. HP seems to always use the same key regardless of what the sticker on the bottom indicates. As a result it throws my compliance reports off in the dashboard. I tried adding it as a volume key but unless I constantly go in there and update it every time I get a new machine it will be "under-utilized", or apply the key to machines that have been activated with legit keys. I also tried setting it as a license type of "OEM" but that only allows for 1 allocation and then, since there can only be one key in the DB, I can't enter another.

I'm sure I'm not alone in this. How is everyone else handling this?