Issue deploying to shared docking station

I work with a police department and they use shared docking stations with devices they normally use in their cars. When they come in and attach to the docking station, the docking station NIC is what get's the IP address, not the actual computer.

Whenever someone comes in with their device, PDQ inventory just looks at the IP address (or MAC address) and not the computer name so therefore it thinks that multiple computers are online when they aren't.

It's causing an issue with setting up deployment schedules that use Heartbeats because it will try to attach to the machine, just to realize that the machine it wants is not actually what's there and the deployment fails. Because people are somewhat regularly in and out using these, I have several failed deployments.

Has anyone else had a similar situation and have any recommendations? I've been told to take a look at Scavenging rules in our DNS. Currently, they are set to No-refresh interval = 7 days; Refresh interval = 7 days. I wanted to see if anyone else had suggestions before playing around with that.