After HA update: HomeKit devices get re-discovered as new ones

Hey there,
yesterday I updated my Home Assistant to the latest version and now all of my Home Assistant switches that I have sent to Apple Homekit got rediscovered by my Homekit system. Which makes a lot of my Homekit setup unusable again. Devices that have been put into scenes and groups inside Homekit are non-existent anymore and need to be placed in their appropriate groups and scenes again with their rediscovered entities.
I had this problem before when I did a restarted of my Home Assistant system 2 months ago and hoped that was a one time issue, but now it happened again after I updated. It’s like, Homekit thinks that the devices are non-existent anymore and handles the re-discovered ones as new devices.
Anyone who is running into the same problems and is there a way to avoid this?