Homekit light features mismatch

I use a lot of Aeotec Smart Switch 7 plugs. These are included in Home Assistant with Z-Wave to MQTT. Unfortunately the configuration that Z-Wave to MQTT generates for these plugs is not entirely correct. This is because except switching the outlet, the plugs also have a tiny RGB light which can be Z-Wave controlled.

I manually “fixed” the config for these plugs in Z-Wave to MQTT so they will act as just a generic switch for the outlet, see below.

{
  "type": "switch",
  "object_id": "switch",
  "discovery_payload": {
    "payload_off": false,
    "payload_on": true,
    "value_template": "{{ value_json.value }}",
    "state_topic": "homeassistant/nodeID_23/37/1/0",
    "command_topic": "homeassistant/nodeID_23/37/1/0/set",
    "device": {
      "identifiers": [
        "zwave2mqtt_0xe0d0c0b_node23"
      ],
      "manufacturer": "Aeotec Limited",
      "model": "ZW175 Smart Switch 7 (0x00af)",
      "name": "nodeID_23",
      "sw_version": "Unknown"
    },
    "name": "nodeID_23_rgb_switch",
    "unique_id": "zwave2mqtt_0xe0d0c0b_23-37-1-0"
  },
  "discoveryTopic": "light/nodeID_23/rgb_switch/config",
  "values": [
    "37-1-0"
  ],
  "persistent": true,
  "ignoreDiscovery": false,
  "id": "light_rgb_switch"
}

Now Home Assistant wil treat these plugs as a generic on/off light, instead of RGB.

Screen Shot 2020-12-10 at 10.16.16 AM

Ok, all good. But now, some of those lights are also a generic on/off light in Homekit, while others are still RGB. I tried calling the homekit.reset_accessory for those lights, but they just keep popping up as RGB light in Homekit.

Anyone an idea how to fix this? Thanks in advance.