Zigbee2MQTT IKEA motion sensors do not have correct class

I have a number of the above sensors that are connected via Zigbee2MQTT. I use them to set/unset room occupancy states that are then used by automations.

I am currently using my own automations, but noted there was a blueprint to implement a motion-sensitive light. When I tried to use it, the motion sensors didn’t show up because that do have device_class: motion in their definitions.

Two questions:
1 Is this a known problem and can it be fixed?
2 Can I manually change this when they are added through the MQTT integration?

Gareth