ZHA to Zigbee2MQTT migration and HomeKit Bridge - Sensors not showing up in Home app

Hello there.

I'm trying to move from ZHA to Z2M and I'm having an issue where some entities aren't showing up in the Home app despite them being added to a bridge in the HomeKit Bridge integration.

The devices in question are both Tuya TS0601 (_TZE200_yvx5lh6k and _TZE200_dwcarsat). They expose Temperature, Humidity, CO2, VOC, Formaldehyde with one also exposing PM2.5.

Temperature, Humidity and CO2 are showing up in Home app, but VOC, Formaldehyde and PM2.5 aren't even after ensuring they're all in a bridge.

After checking the Entities tab and searching VOC, I see that ZHA shows up as "Volatile organic compounds" but Z2M shows up as "Volatile organic compounds parts" and when searching formaldehyde, ZHA shows up as "Formaldehyde concentration" but Z2M shows up as "Formaldehyd". I believe this to be the culprit. I tried renaming the entities but that didn't resolve the issue.

Does anyone know how to fix this?

Thanks in advance.

I'm running Home Assistant OS inside Proxmox and Zigbee2Mqtt on a separate raspberry pi.

https://www.zigbee2mqtt.io/devices/TS0601_air_quality_sensor.html

https://www.zigbee2mqtt.io/devices/TS0601_smart_air_house_keeper.html