Cant assign multiple Thermostats to different rooms

I am using a Tuya TS0004_switch_module to control circulators for each of 4 zones. I have different Tuya SNZB-02 equivalent Temp Sensors for each room. I have created a generic Thermostat for each zone and assigned the correct TH sensor and Switch to each thermostat. But all of the generic Thermostats get assigned to the room/area of the first. Further When I look at the device info for any of these Generic Thermostats they all show All TH sensors and All Switches on the TS0004.

All of this occured when I switched from ZHA to Zigbee2MQTT(fresh install of HA).