diff --git a/README.md b/README.md
index f95e97bf..3dde9425 100644
--- a/README.md
+++ b/README.md
@@ -213,6 +213,18 @@ TBD
 -->
 
 ## Changelog
+
+### __WORK IN PROGRESS__
+* (@Apollon77) Makes sure to delete all objects and stop device when a device is deleted in UI
+* (@Apollon77) When a devices/bridge object is deleted and adapter runs we try to detect this and stop the device/bridge
+* (@Apollon77) Optimizes close handling of adapter
+* (@Apollon77) Uses adapter version as Software and Hardware versions in the exposed Matter devices
+* (@Apollon77) Fixes "auto" flags in backend when make no sense in objects
+* (@Apollon77) Fixes "auto" flag in UI
+* (@Apollon77) Prevents cyclic state updates when a state is updated by the adapter to matter
+* (@Apollon77) Log warnings when device optional device states are not mapped
+* (@Apollon77) Hides Product-ID and VendorId fields in UI when adding devices into a bridge
+
 ### 0.2.2 (2024-11-28)
 * (@Apollon77) Uses plain matter.js logs for better readability
 * (@Apollon77) Prevents ghost connection entries in the UI
diff --git a/package-lock.json b/package-lock.json
index 935fd7ef..25ec8145 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,9 +13,9 @@
         "@iobroker/dm-utils": "^0.6.9",
         "@iobroker/i18n": "^0.3.1",
         "@iobroker/type-detector": "^4.0.1",
-        "@matter/main": "0.11.6",
-        "@matter/nodejs": "0.11.6",
-        "@project-chip/matter.js": "0.11.6",
+        "@matter/main": "0.11.8",
+        "@matter/nodejs": "0.11.8",
+        "@project-chip/matter.js": "0.11.8",
         "axios": "^1.7.8",
         "jsonwebtoken": "^9.0.2"
       },
@@ -40,7 +40,7 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@matter/nodejs-ble": "0.11.6"
+        "@matter/nodejs-ble": "0.11.8"
       }
     },
     "node_modules/@alcalzone/pak": {
@@ -747,64 +747,64 @@
       }
     },
     "node_modules/@matter/general": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.11.6.tgz",
-      "integrity": "sha512-HPFTmaCREFAXPW5JLWwOU5Esbu1fAu2zBnlEbt0+c60vZzoLWbMLxXv0fKz2bSgNuvmly0ccX/1DF4CAlzeDbQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/general/-/general-0.11.8.tgz",
+      "integrity": "sha512-DBfa8A//DNVIpPWJzxQuE81svMTwxwKKNlODEhbJSXohXG8FaYwal2tcUQJCJwVb8eyWybOgKA30oX8qhpbHZw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@noble/curves": "^1.7.0"
       }
     },
     "node_modules/@matter/main": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.11.6.tgz",
-      "integrity": "sha512-NJRFAEF9Pgf2X8oMppAGOUEJdMUzi+evzkLpw4X96f2OpiMjfB3Nvef6C9QmYSzhh8hleCW4PV4ablmBIh9Kig==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/main/-/main-0.11.8.tgz",
+      "integrity": "sha512-6se6hK21KzpltK0BgV3wtsKVeGaT0H9VEkQZQ51InVx7O0EQjib0PoqNorFgdubGTISJnkcR/s/0vYw4PdiDxg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/model": "0.11.6",
-        "@matter/node": "0.11.6",
-        "@matter/protocol": "0.11.6",
-        "@matter/types": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/model": "0.11.8",
+        "@matter/node": "0.11.8",
+        "@matter/protocol": "0.11.8",
+        "@matter/types": "0.11.8",
         "@noble/curves": "^1.7.0"
       },
       "optionalDependencies": {
-        "@matter/nodejs": "0.11.6"
+        "@matter/nodejs": "0.11.8"
       }
     },
     "node_modules/@matter/model": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.11.6.tgz",
-      "integrity": "sha512-D8w2datMmqoSwUejOlm9BONG4vSnc0+MF0GmicTEq1fUnvu1bOcgergtg0IcbyeIkm1n7ngJAAtBxcG5ENh99g==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/model/-/model-0.11.8.tgz",
+      "integrity": "sha512-EPZ8DEiVXYN4VJ3ylHj1hJVwlBJQk2QuePOfXxA2KaM1GSXUKiHW4TeyI+Jez7BzCfuWdyymCufA5grQn6pmEA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
+        "@matter/general": "0.11.8",
         "@noble/curves": "^1.7.0"
       }
     },
     "node_modules/@matter/node": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.11.6.tgz",
-      "integrity": "sha512-zMNWdEhG9TluKbz2J3yBEwtGPlmLYQQQR7Xg1nr2xzUgLaxSal/GXuyr20VdwMa5RvLcdMeW3zJ+uoVhS1Q9zw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/node/-/node-0.11.8.tgz",
+      "integrity": "sha512-TqcsQGlclFcXw5MpnhF4xFSp6B90IDpDDafYRlO+/Zoe4HojdLnRWHyA3OJfoQy7+HXSDVy2aqVi591KotZHng==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/model": "0.11.6",
-        "@matter/protocol": "0.11.6",
-        "@matter/types": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/model": "0.11.8",
+        "@matter/protocol": "0.11.8",
+        "@matter/types": "0.11.8",
         "@noble/curves": "^1.7.0"
       }
     },
     "node_modules/@matter/nodejs": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.11.6.tgz",
-      "integrity": "sha512-nJCMh34AEigLM3/GvHJJ/V0n4+6i9rpH0n19PcdkbKW4Yxvo5cE3l/Nq5Yh9ajTIUMx5Wh13s1N0nlM62WuOdw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/nodejs/-/nodejs-0.11.8.tgz",
+      "integrity": "sha512-4DuO+qnnGCrh0ppt+FkY4HN351ehuFmnrWcD7GNVvog+aNJozjbZm2KrugJczUnd8VEISDFJtUmbQWmx5vVXeA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/node": "0.11.6",
-        "@matter/protocol": "0.11.6",
-        "@matter/types": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/node": "0.11.8",
+        "@matter/protocol": "0.11.8",
+        "@matter/types": "0.11.8",
         "node-localstorage": "^3.0.5"
       },
       "engines": {
@@ -812,15 +812,15 @@
       }
     },
     "node_modules/@matter/nodejs-ble": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/nodejs-ble/-/nodejs-ble-0.11.6.tgz",
-      "integrity": "sha512-FUUhhIK1gp7vg9Bs8eg8o+D74WX4srYde2hrHuxLDjI66dlgUYCnjaKiA+1BC1vmGdmdCjJx397ALKuf197FeQ==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/nodejs-ble/-/nodejs-ble-0.11.8.tgz",
+      "integrity": "sha512-vDgHL66wUomRJVFhHn0tjjgEZNl9kiKLsQfpNr6ZkMiU4e81o9IKO0pyeEjZ1A1VMVDIlYaSwAn/onuMA56dbA==",
       "license": "Apache-2.0",
       "optional": true,
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/protocol": "0.11.6",
-        "@matter/types": "0.11.6"
+        "@matter/general": "0.11.8",
+        "@matter/protocol": "0.11.8",
+        "@matter/types": "0.11.8"
       },
       "engines": {
         "node": ">=18.0.0"
@@ -831,25 +831,25 @@
       }
     },
     "node_modules/@matter/protocol": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.11.6.tgz",
-      "integrity": "sha512-FA0FUBGhXljzNyevS5hmGfRUYQlHetfpX+9RuPs/WD+Xc5ZG3myjLvXkQWiwDdEkR5m1jHzF9uyex5hpUaDstA==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/protocol/-/protocol-0.11.8.tgz",
+      "integrity": "sha512-/Sc/m2X4uEvMoO4g9gX17ZedPhYG2EYEmNvsX9zRMBnL+YAfX4/MrsOl+6Xr6Qe05n02doOpxaNodcQGJE5C/g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/model": "0.11.6",
-        "@matter/types": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/model": "0.11.8",
+        "@matter/types": "0.11.8",
         "@noble/curves": "^1.7.0"
       }
     },
     "node_modules/@matter/types": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.11.6.tgz",
-      "integrity": "sha512-TKaBh1+OFJ1IKuK2x6FG05/udWaNseH8DVJluF5hYIz17rNkkeCBEu6HjRtZpqFpLxOAOlgzrNGmp8BMK+9hJg==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@matter/types/-/types-0.11.8.tgz",
+      "integrity": "sha512-APva+1an3NSNIP3KyYsHxQKEzSwmPn+6nWFIOCiRX3VC5+vTRRBYSAOg/0KMPApHhTrwjbB8R9AhBmPbTIVvdw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/model": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/model": "0.11.8",
         "@noble/curves": "^1.7.0"
       }
     },
@@ -1012,16 +1012,16 @@
       }
     },
     "node_modules/@project-chip/matter.js": {
-      "version": "0.11.6",
-      "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.11.6.tgz",
-      "integrity": "sha512-546FM6h+lKjYkmaW/luB45HLGKlE07MP03/y1peiwy96TMGTcvhbJIUQE0WCGBJM/zBY2XeyR0OVqgw8OmDKzw==",
+      "version": "0.11.8",
+      "resolved": "https://registry.npmjs.org/@project-chip/matter.js/-/matter.js-0.11.8.tgz",
+      "integrity": "sha512-6wF2k7W0RNN0aknB9Vn7Yv3vOQzwcJ7XL3qXSMES62OIe5ZIjNteN3Co/vgyz6r4j2deAif4+4xcMMIy/RqPjA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@matter/general": "0.11.6",
-        "@matter/model": "0.11.6",
-        "@matter/node": "0.11.6",
-        "@matter/protocol": "0.11.6",
-        "@matter/types": "0.11.6",
+        "@matter/general": "0.11.8",
+        "@matter/model": "0.11.8",
+        "@matter/node": "0.11.8",
+        "@matter/protocol": "0.11.8",
+        "@matter/types": "0.11.8",
         "@noble/curves": "^1.7.0"
       }
     },
diff --git a/package.json b/package.json
index 1949a1ab..0abb01bc 100644
--- a/package.json
+++ b/package.json
@@ -23,16 +23,16 @@
     "url": "https://github.com/ioBroker/ioBroker.matter"
   },
   "optionalDependencies": {
-    "@matter/nodejs-ble": "0.11.6"
+    "@matter/nodejs-ble": "0.11.8"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.2",
     "@iobroker/i18n": "^0.3.1",
     "@iobroker/dm-utils": "^0.6.9",
     "@iobroker/type-detector": "^4.0.1",
-    "@matter/main": "0.11.6",
-    "@matter/nodejs": "0.11.6",
-    "@project-chip/matter.js": "0.11.6",
+    "@matter/main": "0.11.8",
+    "@matter/nodejs": "0.11.8",
+    "@project-chip/matter.js": "0.11.8",
     "axios": "^1.7.8",
     "jsonwebtoken": "^9.0.2"
   },
diff --git a/src-admin/package-lock.json b/src-admin/package-lock.json
index b7688e65..60c93b0c 100644
--- a/src-admin/package-lock.json
+++ b/src-admin/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "iobroker.matter",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "iobroker.matter",
-            "version": "0.2.1",
+            "version": "0.2.2",
             "dependencies": {
                 "@foxriver76/iob-component-lib": "^0.1.6",
                 "@iobroker/adapter-react-v5": "^7.4.2",
diff --git a/src-admin/src/Tabs/Bridges.tsx b/src-admin/src/Tabs/Bridges.tsx
index 94f688f9..afe524f4 100644
--- a/src-admin/src/Tabs/Bridges.tsx
+++ b/src-admin/src/Tabs/Bridges.tsx
@@ -157,6 +157,7 @@ interface AddCustomDeviceDialog {
     oid: string;
     name: string;
     deviceType: Types | '';
+    detectedDeviceType?: Types;
     bridgeIndex: number;
     hasOnState?: boolean;
 }
@@ -796,6 +797,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                 addCustomDeviceDialog: {
                                     oid,
                                     name,
+                                    detectedDeviceType: deviceType,
                                     deviceType: SUPPORTED_DEVICES.includes(deviceType) ? deviceType : '',
                                     bridgeIndex: this.bridgeIndex as number,
                                     hasOnState: controls[0].devices[0].hasOnState,
@@ -819,7 +821,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                 socket={this.props.socket}
                 detectedDevices={this.props.detectedDevices}
                 setDetectedDevices={(detectedDevices: DetectedRoom[]) => this.props.setDetectedDevices(detectedDevices)}
-                type="device"
+                type="bridge"
                 name={this.props.matter.bridges[this.state.addDeviceDialog.bridgeIndex].name}
             />
         );
@@ -992,6 +994,9 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                         onClick={() => {
                             const addCustomDeviceDialog = this.state.addCustomDeviceDialog;
                             if (addCustomDeviceDialog) {
+                                const isAutoType =
+                                    !!addCustomDeviceDialog.detectedDeviceType &&
+                                    addCustomDeviceDialog.detectedDeviceType === addCustomDeviceDialog.deviceType;
                                 void this.addDevicesToBridge(
                                     [
                                         {
@@ -999,7 +1004,8 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                             common: {
                                                 name: addCustomDeviceDialog.name,
                                             },
-                                            deviceType: addCustomDeviceDialog.deviceType as Types,
+                                            deviceType: (addCustomDeviceDialog.deviceType ??
+                                                addCustomDeviceDialog.detectedDeviceType) as Types,
                                             hasOnState: addCustomDeviceDialog.hasOnState,
                                             // ignored
                                             type: 'device',
@@ -1008,7 +1014,7 @@ export class Bridges extends BridgesAndDevices<BridgesProps, BridgesState> {
                                         },
                                     ],
                                     addCustomDeviceDialog.bridgeIndex,
-                                    false,
+                                    isAutoType,
                                 );
                             }
 
diff --git a/src-admin/src/Tabs/Devices.tsx b/src-admin/src/Tabs/Devices.tsx
index 330e9573..282f6ab2 100644
--- a/src-admin/src/Tabs/Devices.tsx
+++ b/src-admin/src/Tabs/Devices.tsx
@@ -88,6 +88,7 @@ interface DevicesState extends BridgesAndDevicesState {
         oid: string;
         name: string;
         deviceType: Types | '';
+        detectedDeviceType?: Types;
         vendorID: string;
         productID: string;
         noComposed?: boolean;
@@ -657,24 +658,30 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                 <DialogActions>
                     <Button
                         onClick={() => {
-                            this.state.addCustomDeviceDialog &&
+                            const addCustomDeviceDialog = this.state.addCustomDeviceDialog;
+                            if (addCustomDeviceDialog) {
+                                const isAutoType =
+                                    !!addCustomDeviceDialog.detectedDeviceType &&
+                                    addCustomDeviceDialog.detectedDeviceType === addCustomDeviceDialog.deviceType;
                                 void this.addDevices(
                                     [
                                         {
-                                            _id: this.state.addCustomDeviceDialog.oid,
+                                            _id: addCustomDeviceDialog.oid,
                                             common: {
-                                                name: this.state.addCustomDeviceDialog.name,
+                                                name: addCustomDeviceDialog.name,
                                             },
-                                            deviceType: this.state.addCustomDeviceDialog.deviceType as Types,
-                                            hasOnState: !!this.state.addCustomDeviceDialog.hasOnState,
+                                            deviceType: (addCustomDeviceDialog.deviceType ??
+                                                addCustomDeviceDialog.detectedDeviceType) as Types,
+                                            hasOnState: !!addCustomDeviceDialog.hasOnState,
                                             // ignored
                                             type: 'device',
                                             states: [],
                                             roomName: '',
                                         },
                                     ],
-                                    false,
+                                    isAutoType,
                                 );
+                            }
 
                             this.setState({ addCustomDeviceDialog: null });
                         }}
@@ -812,6 +819,7 @@ class Devices extends BridgesAndDevices<DevicesProps, DevicesState> {
                                 addCustomDeviceDialog: {
                                     oid,
                                     name,
+                                    detectedDeviceType: deviceType,
                                     deviceType: SUPPORTED_DEVICES.includes(deviceType) ? deviceType : '',
                                     hasOnState: controls[0].devices[0].hasOnState,
                                     vendorID: '0xFFF1',
diff --git a/src-admin/src/components/ConfigHandler.tsx b/src-admin/src/components/ConfigHandler.tsx
index 60b1a835..3761357f 100644
--- a/src-admin/src/components/ConfigHandler.tsx
+++ b/src-admin/src/components/ConfigHandler.tsx
@@ -413,7 +413,12 @@ class ConfigHandler {
             if (!newDev) {
                 this.config.devices.splice(d, 1);
                 console.log(`Device ${oldDev.uuid} created`);
-                await this.socket.delObject(`matter.${this.instance}.devices.${oldDev.uuid}`);
+                const obj: ioBroker.ChannelObject = (await this.socket.getObject(
+                    `matter.${this.instance}.devices.${oldDev.uuid}`,
+                )) as ioBroker.ChannelObject;
+                obj.native.deleted = true;
+                console.log(`Device ${obj._id} deleted`);
+                await this.socket.setObject(obj._id, obj);
             }
         }
 
diff --git a/src-admin/src/components/DeviceDialog.tsx b/src-admin/src/components/DeviceDialog.tsx
index 9762f2e7..f85478d7 100644
--- a/src-admin/src/components/DeviceDialog.tsx
+++ b/src-admin/src/components/DeviceDialog.tsx
@@ -366,60 +366,64 @@ class DeviceDialog extends Component<DeviceDialogProps, DeviceDialogState> {
                             this.setState({ rooms });
                         }}
                     />
-                    <TextField
-                        select
-                        disabled={!supported}
-                        style={{ minWidth: 'initial' }}
-                        value={device.vendorID}
-                        onChange={e => {
-                            if (!this.state.rooms) {
-                                return;
-                            }
+                    {this.props.type === 'device' ? (
+                        <>
+                            <TextField
+                                select
+                                disabled={!supported}
+                                style={{ minWidth: 'initial' }}
+                                value={device.vendorID}
+                                onChange={e => {
+                                    if (!this.state.rooms) {
+                                        return;
+                                    }
 
-                            const rooms = clone(this.state.rooms);
-                            rooms[roomIndex].devices[deviceIndex].vendorID = e.target.value;
-                            this.setState({ rooms });
-                        }}
-                        label={I18n.t('Vendor ID')}
-                        helperText={<span style={styles.spaceHolder} />}
-                        variant="standard"
-                    >
-                        {['0xFFF1', '0xFFF2', '0xFFF3', '0xFFF4'].map(vendorId => (
-                            <MenuItem
-                                key={vendorId}
-                                value={vendorId}
+                                    const rooms = clone(this.state.rooms);
+                                    rooms[roomIndex].devices[deviceIndex].vendorID = e.target.value;
+                                    this.setState({ rooms });
+                                }}
+                                label={I18n.t('Vendor ID')}
+                                helperText={<span style={styles.spaceHolder} />}
+                                variant="standard"
                             >
-                                {vendorId}
-                            </MenuItem>
-                        ))}
-                    </TextField>
-                    <TextField
-                        select
-                        disabled={!supported}
-                        style={{ minWidth: 'initial' }}
-                        value={device.productID}
-                        onChange={e => {
-                            if (!this.state.rooms) {
-                                return;
-                            }
+                                {['0xFFF1', '0xFFF2', '0xFFF3', '0xFFF4'].map(vendorId => (
+                                    <MenuItem
+                                        key={vendorId}
+                                        value={vendorId}
+                                    >
+                                        {vendorId}
+                                    </MenuItem>
+                                ))}
+                            </TextField>
+                            <TextField
+                                select
+                                disabled={!supported}
+                                style={{ minWidth: 'initial' }}
+                                value={device.productID}
+                                onChange={e => {
+                                    if (!this.state.rooms) {
+                                        return;
+                                    }
 
-                            const rooms = clone(this.state.rooms);
-                            rooms[roomIndex].devices[deviceIndex].productID = e.target.value;
-                            this.setState({ rooms });
-                        }}
-                        label={I18n.t('Product ID')}
-                        helperText={<span style={styles.spaceHolder} />}
-                        variant="standard"
-                    >
-                        {productIds.map(productId => (
-                            <MenuItem
-                                key={productId}
-                                value={productId}
+                                    const rooms = clone(this.state.rooms);
+                                    rooms[roomIndex].devices[deviceIndex].productID = e.target.value;
+                                    this.setState({ rooms });
+                                }}
+                                label={I18n.t('Product ID')}
+                                helperText={<span style={styles.spaceHolder} />}
+                                variant="standard"
                             >
-                                {productId}
-                            </MenuItem>
-                        ))}
-                    </TextField>
+                                {productIds.map(productId => (
+                                    <MenuItem
+                                        key={productId}
+                                        value={productId}
+                                    >
+                                        {productId}
+                                    </MenuItem>
+                                ))}
+                            </TextField>
+                        </>
+                    ) : null}
                 </div>
             </div>
         );
diff --git a/src/lib/devices/DeviceStateObject.ts b/src/lib/devices/DeviceStateObject.ts
index 6a92016a..2d08e843 100644
--- a/src/lib/devices/DeviceStateObject.ts
+++ b/src/lib/devices/DeviceStateObject.ts
@@ -479,6 +479,9 @@ export class DeviceStateObject<T> {
         } else {
             this.value = value as T;
         }
+        this.adapter.log.debug(
+            `Received state change for ${this.#id}: ${JSON.stringify(state.val)} (ack=${state.ack}) --> ${JSON.stringify(this.value)}`,
+        );
         if (this.updateHandler) {
             await this.updateHandler(this);
         }
diff --git a/src/lib/devices/GenericDevice.ts b/src/lib/devices/GenericDevice.ts
index c8cb9f33..9dcaff0e 100644
--- a/src/lib/devices/GenericDevice.ts
+++ b/src/lib/devices/GenericDevice.ts
@@ -187,6 +187,10 @@ abstract class GenericDevice {
         }
     }
 
+    get adapter(): ioBroker.Adapter {
+        return this.#adapter;
+    }
+
     async addDeviceState<T>(
         name: string,
         type: PropertyType,
diff --git a/src/main.ts b/src/main.ts
index 1c56f1f0..0c579c2a 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -78,7 +78,7 @@ export class MatterAdapter extends utils.Adapter {
     #detector: ChannelDetector;
     #_guiSubscribes: { clientId: string; ts: number }[] | null = null;
     readonly #matterEnvironment: Environment;
-    #stateTimeout: NodeJS.Timeout | null = null;
+    #stateTimeout?: ioBroker.Timeout;
     #license: { [key: string]: boolean | undefined } = {};
     sysLanguage: ioBroker.Languages = 'en';
     readonly #deviceManagement: MatterAdapterDeviceManagement;
@@ -87,6 +87,8 @@ export class MatterAdapter extends utils.Adapter {
     t: (word: string, ...args: (string | number | boolean | null)[]) => string;
     getText: (word: string, ...args: (string | number | boolean | null)[]) => ioBroker.Translated;
     #nodeReSyncInProgress = new Set<string>();
+    #closing = false;
+    #version: string = '0.0.0';
 
     public constructor(options: Partial<utils.AdapterOptions> = {}) {
         super({
@@ -129,6 +131,17 @@ export class MatterAdapter extends utils.Adapter {
         return this.#controller;
     }
 
+    get versions(): { versionStr: string; versionNum: number } {
+        const versionParts = this.#version.split('.');
+        // Create a numeric version number from the version string, multiply parts from end to start with 100^index
+        const numVersion = versionParts.reduce((acc, part, index) => acc + parseInt(part) * Math.pow(100, index), 0);
+
+        return {
+            versionStr: this.#version,
+            versionNum: numVersion,
+        };
+    }
+
     async shutDownMatterNodes(): Promise<void> {
         for (const device of this.#devices.values()) {
             await device.stop();
@@ -284,8 +297,8 @@ export class MatterAdapter extends utils.Adapter {
         const sub = this.#_guiSubscribes.find(s => s.clientId === clientId);
         if (!sub) {
             this.#_guiSubscribes.push({ clientId, ts: Date.now() });
-            this.#stateTimeout && clearTimeout(this.#stateTimeout);
-            this.#stateTimeout = setTimeout(async () => {
+            this.#stateTimeout && this.clearTimeout(this.#stateTimeout);
+            this.#stateTimeout = this.setTimeout(async () => {
                 this.#stateTimeout = null;
                 const states = await this.requestNodeStates();
                 await this.sendToGui({ command: 'bridgeStates', states });
@@ -327,6 +340,9 @@ export class MatterAdapter extends utils.Adapter {
 
     /** This command will be sent to GUI to update the controller devices */
     #refreshControllerDevices(): void {
+        if (this.#closing) {
+            return;
+        }
         this.#sendControllerUpdateTimeout =
             this.#sendControllerUpdateTimeout ??
             this.setTimeout(() => {
@@ -407,6 +423,13 @@ export class MatterAdapter extends utils.Adapter {
                 );
             }
         }
+
+        try {
+            this.#version = require('./package.json').version;
+        } catch (error) {
+            this.log.error(`Can not read version from package.json: ${error}`);
+        }
+
         // init i18n
         const i18n = await I18n;
         await i18n.init(`${__dirname}/lib`, this);
@@ -465,8 +488,11 @@ export class MatterAdapter extends utils.Adapter {
     }
 
     async onUnload(callback: () => void): Promise<void> {
+        this.#closing = true;
         this.#stateTimeout && clearTimeout(this.#stateTimeout);
-        this.#stateTimeout = null;
+        this.#stateTimeout = undefined;
+        this.#sendControllerUpdateTimeout && clearTimeout(this.#sendControllerUpdateTimeout);
+        this.#sendControllerUpdateTimeout = undefined;
 
         try {
             // inform GUI about stop
@@ -489,6 +515,25 @@ export class MatterAdapter extends utils.Adapter {
         const objPartsLength = objParts.length;
         this.log.debug(`Object changed ${id}, type = ${obj?.type}, length=${objPartsLength}`);
 
+        if (
+            ((objParts[0] === 'devices' && objPartsLength === 2) ||
+                (objParts[0] === 'bridges' && objPartsLength === 2)) &&
+            obj === undefined
+        ) {
+            this.log.warn(`Object ${id} deleted ... trying to also remove it from matter`);
+            // We try to restore a minimum object that we can handle the deletion
+            obj = {
+                _id: id,
+                type: 'channel',
+                common: {
+                    name: id,
+                },
+                native: {
+                    deleted: true,
+                    uuid: objParts[1],
+                },
+            } as ioBroker.Object;
+        }
         // matter.0.bridges.a6e61de9-e450-47bb-8f27-ee360350bdd8
         if (
             ((objParts[0] === 'devices' && objPartsLength === 2) ||
@@ -689,6 +734,15 @@ export class MatterAdapter extends utils.Adapter {
     }
 
     async determineIoBrokerDevice(oid: string, type: string, auto: boolean): Promise<DetectedDevice> {
+        if (!auto) {
+            // Fix for wrong UI currently that sets auto to false when channel or device is selected
+            const obj = await this.getForeignObjectAsync(oid);
+            if (obj && (obj.type === 'device' || obj.type === 'channel')) {
+                auto = true;
+                this.log.debug(`Enable auto detection for ${oid} with type ${type} because object is ${obj.type}`);
+            }
+        }
+
         const detectedDevice = await this.getIoBrokerDeviceStates(oid);
         if (detectedDevice && detectedDevice.type === type && auto) {
             return detectedDevice;
@@ -726,7 +780,7 @@ export class MatterAdapter extends utils.Adapter {
         options.list = options.list ?? [];
         const devices = [];
         for (const device of options.list) {
-            this.log.debug(`Prepare device ${device.uuid} "${device.name}"`);
+            this.log.debug(`Prepare bridged device ${device.uuid} "${device.name}" (auto=${device.auto})`);
             const detectedDevice = await this.determineIoBrokerDevice(device.oid, device.type, device.auto);
             try {
                 const deviceObject = await DeviceFactory(detectedDevice, this, device as DeviceOptions);
@@ -788,6 +842,8 @@ export class MatterAdapter extends utils.Adapter {
         if (options.enabled === false) {
             return null; // Not startup
         }
+
+        this.log.debug(`Prepare device ${options.uuid} "${options.name}" (auto=${options.auto})`);
         const detectedDevice = await this.determineIoBrokerDevice(options.oid, options.type, options.auto);
         try {
             const device = await DeviceFactory(detectedDevice, this, options as DeviceOptions);
diff --git a/src/matter/BridgedDevicesNode.ts b/src/matter/BridgedDevicesNode.ts
index fb22859c..42136ccb 100644
--- a/src/matter/BridgedDevicesNode.ts
+++ b/src/matter/BridgedDevicesNode.ts
@@ -140,6 +140,7 @@ class BridgedDevices extends BaseServerNode {
             return;
         }
 
+        const versions = this.adapter.versions;
         this.serverNode = await ServerNode.create({
             id: this.#parameters.uuid,
             network: {
@@ -158,6 +159,10 @@ class BridgedDevices extends BaseServerNode {
                 productId,
                 serialNumber: uniqueId,
                 uniqueId: md5(uniqueId),
+                hardwareVersion: versions.versionNum,
+                hardwareVersionString: versions.versionStr,
+                softwareVersion: versions.versionNum,
+                softwareVersionString: versions.versionStr,
             },
         });
 
diff --git a/src/matter/DeviceNode.ts b/src/matter/DeviceNode.ts
index a5c8a8ed..0c32a93a 100644
--- a/src/matter/DeviceNode.ts
+++ b/src/matter/DeviceNode.ts
@@ -84,6 +84,7 @@ class Device extends BaseServerNode {
         // The device type to announce we use from the first returned endpoint of the device
         const deviceType = endpoints[0].type.deviceType;
 
+        const versions = this.adapter.versions;
         try {
             this.serverNode = await ServerNode.create({
                 id: this.#parameters.uuid,
@@ -103,6 +104,10 @@ class Device extends BaseServerNode {
                     productId,
                     serialNumber: uniqueId,
                     uniqueId: md5(uniqueId),
+                    hardwareVersion: versions.versionNum,
+                    hardwareVersionString: versions.versionStr,
+                    softwareVersion: versions.versionNum,
+                    softwareVersionString: versions.versionStr,
                 },
             });
         } catch (error) {
diff --git a/src/matter/behaviors/EventedDoorLockServer.ts b/src/matter/behaviors/EventedDoorLockServer.ts
new file mode 100644
index 00000000..2a89a663
--- /dev/null
+++ b/src/matter/behaviors/EventedDoorLockServer.ts
@@ -0,0 +1,19 @@
+import { DoorLockRequirements } from '@matter/main/devices';
+import { DoorLock } from '@matter/main/clusters';
+import { IoBrokerEvents } from './IoBrokerEvents';
+
+export class EventedDoorLockServer extends DoorLockRequirements.DoorLockServer {
+    override lockDoor(): void {
+        this.endpoint.act(agent =>
+            agent.get(IoBrokerEvents).events.doorLockStateControlled.emit(DoorLock.LockState.Locked),
+        );
+        super.lockDoor();
+    }
+
+    override unlockDoor(): void {
+        this.endpoint.act(agent =>
+            agent.get(IoBrokerEvents).events.doorLockStateControlled.emit(DoorLock.LockState.Unlocked),
+        );
+        super.unlockDoor();
+    }
+}
diff --git a/src/matter/behaviors/EventedLightingColorControlServer.ts b/src/matter/behaviors/EventedLightingColorControlServer.ts
new file mode 100644
index 00000000..b65bdb9d
--- /dev/null
+++ b/src/matter/behaviors/EventedLightingColorControlServer.ts
@@ -0,0 +1,55 @@
+import { MaybePromise } from '@matter/main';
+import { ColorTemperatureLightRequirements } from '@matter/main/devices';
+import { IoBrokerEvents } from './IoBrokerEvents';
+import type { ColorControl } from '@matter/main/clusters';
+
+export class EventedColorTemperatureColorControlServer extends ColorTemperatureLightRequirements.ColorControlServer {
+    override moveToColorTemperatureLogic(targetMireds: number, transitionTime: number): MaybePromise {
+        const result = super.moveToColorTemperatureLogic(targetMireds, transitionTime);
+        return MaybePromise.then(result, () =>
+            this.endpoint.act(agent =>
+                agent.get(IoBrokerEvents).events.colorTemperatureControlled.emit(this.state.colorTemperatureMireds),
+            ),
+        );
+    }
+
+    override moveColorTemperatureLogic(
+        moveMode: ColorControl.MoveMode,
+        rate: number,
+        colorTemperatureMinimumMireds: number,
+        colorTemperatureMaximumMireds: number,
+    ): MaybePromise {
+        const result = super.moveColorTemperatureLogic(
+            moveMode,
+            rate,
+            colorTemperatureMinimumMireds,
+            colorTemperatureMaximumMireds,
+        );
+        return MaybePromise.then(result, () =>
+            this.endpoint.act(agent =>
+                agent.get(IoBrokerEvents).events.colorTemperatureControlled.emit(this.state.colorTemperatureMireds),
+            ),
+        );
+    }
+
+    override stepColorTemperatureLogic(
+        stepMode: ColorControl.StepMode,
+        stepSize: number,
+        transitionTime: number,
+        colorTemperatureMinimumMireds: number,
+        colorTemperatureMaximumMireds: number,
+    ): MaybePromise {
+        const result = super.stepColorTemperatureLogic(
+            stepMode,
+            stepSize,
+            transitionTime,
+            colorTemperatureMinimumMireds,
+            colorTemperatureMaximumMireds,
+        );
+        return MaybePromise.then(result, () =>
+            this.endpoint.act(agent =>
+                agent.get(IoBrokerEvents).events.colorTemperatureControlled.emit(this.state.colorTemperatureMireds),
+            ),
+        );
+    }
+}
diff --git a/src/matter/behaviors/EventedLightingLevelControlServer.ts b/src/matter/behaviors/EventedLightingLevelControlServer.ts
new file mode 100644
index 00000000..4eaf4cb3
--- /dev/null
+++ b/src/matter/behaviors/EventedLightingLevelControlServer.ts
@@ -0,0 +1,18 @@
+import { MaybePromise } from '@matter/main';
+import type { TypeFromPartialBitSchema } from '@matter/main/types';
+import { DimmableLightRequirements } from '@matter/main/devices';
+import type { LevelControl } from '@matter/main/clusters';
+import { IoBrokerEvents } from './IoBrokerEvents';
+
+export class EventedLightingLevelControlServer extends DimmableLightRequirements.LevelControlServer {
+    override setLevel(
+        level: number,
+        withOnOff: boolean,
+        options: TypeFromPartialBitSchema<typeof LevelControl.Options> = {},
+    ): MaybePromise<void> {
+        const result = super.setLevel(level, withOnOff, options);
+        return MaybePromise.then(result, () =>
+            this.endpoint.act(agent => agent.get(IoBrokerEvents).events.dimmerLevelControlled.emit(level)),
+        );
+    }
+}
diff --git a/src/matter/behaviors/EventedOnOffLightOnOffServer.ts b/src/matter/behaviors/EventedOnOffLightOnOffServer.ts
new file mode 100644
index 00000000..0fe30951
--- /dev/null
+++ b/src/matter/behaviors/EventedOnOffLightOnOffServer.ts
@@ -0,0 +1,15 @@
+import { type MaybePromise } from '@matter/main';
+import { OnOffLightRequirements } from '@matter/main/devices';
+import { IoBrokerEvents } from './IoBrokerEvents';
+
+export class EventedOnOffLightOnOffServer extends OnOffLightRequirements.OnOffServer {
+    override on(): MaybePromise<void> {
+        this.endpoint.act(agent => agent.get(IoBrokerEvents).events.onOffControlled.emit(true));
+        return super.on();
+    }
+
+    override off(): MaybePromise<void> {
+        this.endpoint.act(agent => agent.get(IoBrokerEvents).events.onOffControlled.emit(false));
+        return super.off();
+    }
+}
diff --git a/src/matter/behaviors/EventedOnOffPlugInUnitOnOffServer.ts b/src/matter/behaviors/EventedOnOffPlugInUnitOnOffServer.ts
new file mode 100644
index 00000000..53dba28d
--- /dev/null
+++ b/src/matter/behaviors/EventedOnOffPlugInUnitOnOffServer.ts
@@ -0,0 +1,15 @@
+import { type MaybePromise } from '@matter/main';
+import { OnOffPlugInUnitRequirements } from '@matter/main/devices';
+import { IoBrokerEvents } from './IoBrokerEvents';
+
+export class EventedOnOffPlugInUnitOnOffServer extends OnOffPlugInUnitRequirements.OnOffServer {
+    override on(): MaybePromise<void> {
+        this.endpoint.act(agent => agent.get(IoBrokerEvents).events.onOffControlled.emit(true));
+        return super.on();
+    }
+
+    override off(): MaybePromise<void> {
+        this.endpoint.act(agent => agent.get(IoBrokerEvents).events.onOffControlled.emit(false));
+        return super.off();
+    }
+}
diff --git a/src/matter/behaviors/IoBrokerEvents.ts b/src/matter/behaviors/IoBrokerEvents.ts
new file mode 100644
index 00000000..c9ede548
--- /dev/null
+++ b/src/matter/behaviors/IoBrokerEvents.ts
@@ -0,0 +1,18 @@
+import { Behavior, Observable } from '@matter/main';
+import type { DoorLock } from '@matter/main/clusters';
+
+export class IoBrokerEvents extends Behavior {
+    static override readonly id = 'ioBrokerEvents';
+
+    declare events: IoBrokerEvents.Events;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace IoBrokerEvents {
+    export class Events extends Behavior.Events {
+        onOffControlled = new Observable<[boolean]>();
+        dimmerLevelControlled = new Observable<[number]>();
+        colorTemperatureControlled = new Observable<[number]>();
+        doorLockStateControlled = new Observable<[DoorLock.LockState]>();
+    }
+}
diff --git a/src/matter/to-matter/CtToMatter.ts b/src/matter/to-matter/CtToMatter.ts
index 88fc8159..65862a75 100644
--- a/src/matter/to-matter/CtToMatter.ts
+++ b/src/matter/to-matter/CtToMatter.ts
@@ -7,20 +7,32 @@ import { GenericElectricityDataDeviceToMatter } from './GenericElectricityDataDe
 import { initializeMaintenanceStateHandlers } from './SharedStateHandlers';
 import type Ct from '../../lib/devices/Ct';
 import { kelvinToMireds as kToM, miredsToKelvin } from '@matter/main/behaviors';
+import { EventedOnOffLightOnOffServer } from '../behaviors/EventedOnOffLightOnOffServer';
+import { EventedLightingLevelControlServer } from '../behaviors/EventedLightingLevelControlServer';
+import { IoBrokerEvents } from '../behaviors/IoBrokerEvents';
+import { EventedColorTemperatureColorControlServer } from '../behaviors/EventedLightingColorControlServer';
 
 // Remove with matter.js > 0.11.5
 function kelvinToMireds(kelvin: number): number {
     return Math.round(kToM(kelvin));
 }
 
+const IoBrokerColorTemperatureLightDevice = ColorTemperatureLightDevice.with(
+    EventedOnOffLightOnOffServer,
+    EventedLightingLevelControlServer,
+    EventedColorTemperatureColorControlServer,
+    IoBrokerEvents,
+);
+type IoBrokerColorTemperatureLightDevice = typeof IoBrokerColorTemperatureLightDevice;
+
 /** Mapping Logic to map a ioBroker Dimmer device to a Matter DimmableLightDevice. */
 export class CtToMatter extends GenericElectricityDataDeviceToMatter {
     readonly #ioBrokerDevice: Ct;
-    readonly #matterEndpoint: Endpoint<ColorTemperatureLightDevice>;
+    readonly #matterEndpoint: Endpoint<IoBrokerColorTemperatureLightDevice>;
 
     constructor(ioBrokerDevice: GenericDevice, name: string, uuid: string) {
         super(name, uuid);
-        this.#matterEndpoint = new Endpoint(ColorTemperatureLightDevice, {
+        this.#matterEndpoint = new Endpoint(IoBrokerColorTemperatureLightDevice, {
             id: uuid,
             colorControl: {
                 remainingTime: 0,
@@ -57,24 +69,32 @@ export class CtToMatter extends GenericElectricityDataDeviceToMatter {
 
     registerMatterHandlers(): void {
         if (this.ioBrokerDevice.hasPower()) {
-            this.#matterEndpoint.events.onOff.onOff$Changed.on(async on => {
+            this.#matterEndpoint.events.ioBrokerEvents.onOffControlled.on(async on => {
                 const currentValue = !!this.#ioBrokerDevice.getPower();
                 if (on !== currentValue) {
                     await this.#ioBrokerDevice.setPower(on);
                 }
             });
+        } else {
+            this.#ioBrokerDevice.adapter.log.info(
+                `Device ${this.#ioBrokerDevice.deviceType} (${this.ioBrokerDevice.uuid}) has no mapped power state`,
+            );
         }
 
         if (this.ioBrokerDevice.hasDimmer()) {
-            this.#matterEndpoint.events.levelControl.currentLevel$Changed.on(async (level: number | null) => {
+            this.#matterEndpoint.events.ioBrokerEvents.dimmerLevelControlled.on(async level => {
                 const currentValue = this.#ioBrokerDevice.getDimmer();
                 if (level !== currentValue && level !== null) {
                     await this.#ioBrokerDevice.setDimmer(Math.round((level / 254) * 100));
                 }
             });
+        } else {
+            this.#ioBrokerDevice.adapter.log.info(
+                `Device ${this.#ioBrokerDevice.deviceType} (${this.ioBrokerDevice.uuid}) has no mapped dimmer state`,
+            );
         }
 
-        this.#matterEndpoint.events.colorControl.colorTemperatureMireds$Changed.on(async (mireds: number) => {
+        this.#matterEndpoint.events.ioBrokerEvents.colorTemperatureControlled.on(async (mireds: number) => {
             const currentValue = this.#ioBrokerDevice.getTemperature();
 
             const kelvin = miredsToKelvin(mireds);
diff --git a/src/matter/to-matter/DimmerToMatter.ts b/src/matter/to-matter/DimmerToMatter.ts
index a97edfac..41c849a3 100644
--- a/src/matter/to-matter/DimmerToMatter.ts
+++ b/src/matter/to-matter/DimmerToMatter.ts
@@ -6,15 +6,25 @@ import type Dimmer from '../../lib/devices/Dimmer';
 import type { IdentifyOptions } from './GenericDeviceToMatter';
 import { GenericElectricityDataDeviceToMatter } from './GenericElectricityDataDeviceToMatter';
 import { initializeMaintenanceStateHandlers } from './SharedStateHandlers';
+import { EventedOnOffLightOnOffServer } from '../behaviors/EventedOnOffLightOnOffServer';
+import { IoBrokerEvents } from '../behaviors/IoBrokerEvents';
+import { EventedLightingLevelControlServer } from '../behaviors/EventedLightingLevelControlServer';
+
+const IoBrokerDimmableLightDevice = DimmableLightDevice.with(
+    EventedOnOffLightOnOffServer,
+    EventedLightingLevelControlServer,
+    IoBrokerEvents,
+);
+type IoBrokerDimmableLightDevice = typeof IoBrokerDimmableLightDevice;
 
 /** Mapping Logic to map a ioBroker Dimmer device to a Matter DimmableLightDevice. */
 export class DimmerToMatter extends GenericElectricityDataDeviceToMatter {
     readonly #ioBrokerDevice: Dimmer;
-    readonly #matterEndpoint: Endpoint<DimmableLightDevice>;
+    readonly #matterEndpoint: Endpoint<IoBrokerDimmableLightDevice>;
 
     constructor(ioBrokerDevice: GenericDevice, name: string, uuid: string) {
         super(name, uuid);
-        this.#matterEndpoint = new Endpoint(DimmableLightDevice, { id: uuid });
+        this.#matterEndpoint = new Endpoint(IoBrokerDimmableLightDevice, { id: uuid });
         this.#ioBrokerDevice = ioBrokerDevice as Dimmer;
         this.addElectricityDataClusters(this.#matterEndpoint, this.#ioBrokerDevice);
     }
@@ -40,15 +50,19 @@ export class DimmerToMatter extends GenericElectricityDataDeviceToMatter {
 
     registerMatterHandlers(): void {
         if (this.ioBrokerDevice.hasPower()) {
-            this.#matterEndpoint.events.onOff.onOff$Changed.on(async on => {
+            this.#matterEndpoint.events.ioBrokerEvents.onOffControlled.on(async on => {
                 const currentValue = !!this.#ioBrokerDevice.getPower();
                 if (on !== currentValue) {
                     await this.#ioBrokerDevice.setPower(on);
                 }
             });
+        } else {
+            this.#ioBrokerDevice.adapter.log.info(
+                `Device ${this.#ioBrokerDevice.deviceType} (${this.ioBrokerDevice.uuid}) has no mapped power state`,
+            );
         }
 
-        this.#matterEndpoint.events.levelControl.currentLevel$Changed.on(async (level: number | null) => {
+        this.#matterEndpoint.events.ioBrokerEvents.dimmerLevelControlled.on(async level => {
             const currentValue = this.#ioBrokerDevice.getLevel();
             if (level !== currentValue && level !== null) {
                 await this.#ioBrokerDevice.setLevel(Math.round((level / 254) * 100));
diff --git a/src/matter/to-matter/LightToMatter.ts b/src/matter/to-matter/LightToMatter.ts
index 95b31e52..dcbc95b9 100644
--- a/src/matter/to-matter/LightToMatter.ts
+++ b/src/matter/to-matter/LightToMatter.ts
@@ -6,15 +6,20 @@ import type Light from '../../lib/devices/Light';
 import type { IdentifyOptions } from './GenericDeviceToMatter';
 import { GenericElectricityDataDeviceToMatter } from './GenericElectricityDataDeviceToMatter';
 import { initializeMaintenanceStateHandlers } from './SharedStateHandlers';
+import { EventedOnOffLightOnOffServer } from '../behaviors/EventedOnOffLightOnOffServer';
+import { IoBrokerEvents } from '../behaviors/IoBrokerEvents';
+
+const IoBrokerOnOffLightDevice = OnOffLightDevice.with(EventedOnOffLightOnOffServer, IoBrokerEvents);
+type IoBrokerOnOffLightDevice = typeof IoBrokerOnOffLightDevice;
 
 /** Mapping Logic to map a ioBroker Light device to a Matter OnOffLightDevice. */
 export class LightToMatter extends GenericElectricityDataDeviceToMatter {
     readonly #ioBrokerDevice: Light;
-    readonly #matterEndpoint: Endpoint<OnOffLightDevice>;
+    readonly #matterEndpoint: Endpoint<IoBrokerOnOffLightDevice>;
 
     constructor(ioBrokerDevice: GenericDevice, name: string, uuid: string) {
         super(name, uuid);
-        this.#matterEndpoint = new Endpoint(OnOffLightDevice, { id: uuid });
+        this.#matterEndpoint = new Endpoint(IoBrokerOnOffLightDevice, { id: uuid });
         this.#ioBrokerDevice = ioBrokerDevice as Light;
         this.addElectricityDataClusters(this.#matterEndpoint, this.#ioBrokerDevice);
     }
@@ -41,7 +46,7 @@ export class LightToMatter extends GenericElectricityDataDeviceToMatter {
     registerMatterHandlers(): void {
         // install matter listeners
         // here we can react on changes from the matter side for onOff
-        this.#matterEndpoint.events.onOff.onOff$Changed.on(async on => {
+        this.#matterEndpoint.events.ioBrokerEvents.onOffControlled.on(async on => {
             const currentValue = !!this.#ioBrokerDevice.getPower();
             if (on !== currentValue) {
                 await this.#ioBrokerDevice.setPower(on);
diff --git a/src/matter/to-matter/LockToMatter.ts b/src/matter/to-matter/LockToMatter.ts
index bd9d556e..a4408480 100644
--- a/src/matter/to-matter/LockToMatter.ts
+++ b/src/matter/to-matter/LockToMatter.ts
@@ -7,16 +7,23 @@ import type Lock from '../../lib/devices/Lock';
 import type { IdentifyOptions } from './GenericDeviceToMatter';
 import { GenericElectricityDataDeviceToMatter } from './GenericElectricityDataDeviceToMatter';
 import { initializeMaintenanceStateHandlers } from './SharedStateHandlers';
+import { IoBrokerEvents } from '../behaviors/IoBrokerEvents';
+import { EventedDoorLockServer } from '../behaviors/EventedDoorLockServer';
+
+const IoBrokerDoorLockDevice = DoorLockDevice.with(EventedDoorLockServer, IoBrokerEvents);
+type IoBrokerDoorLockDevice = typeof IoBrokerDoorLockDevice;
+
+// TODO Add Latching support when "Open" is there!
 
 /** Mapping Logic to map a ioBroker Light device to a Matter OnOffLightDevice. */
 export class LockToMatter extends GenericElectricityDataDeviceToMatter {
     readonly #ioBrokerDevice: Lock;
-    readonly #matterEndpoint: Endpoint<DoorLockDevice>;
+    readonly #matterEndpoint: Endpoint<IoBrokerDoorLockDevice>;
 
     constructor(ioBrokerDevice: GenericDevice, name: string, uuid: string) {
         super(name, uuid);
 
-        this.#matterEndpoint = new Endpoint(DoorLockDevice, {
+        this.#matterEndpoint = new Endpoint(IoBrokerDoorLockDevice, {
             id: uuid,
             doorLock: {
                 lockType: DoorLock.LockType.Other,
@@ -48,7 +55,7 @@ export class LockToMatter extends GenericElectricityDataDeviceToMatter {
     registerMatterHandlers(): void {
         // install matter listeners
         // here we can react on changes from the matter side for onOff
-        this.#matterEndpoint.events.doorLock.lockState$Changed.on(async state => {
+        this.#matterEndpoint.events.ioBrokerEvents.doorLockStateControlled.on(async state => {
             const currentState = this.#ioBrokerDevice.getLockState()
                 ? DoorLock.LockState.Locked
                 : DoorLock.LockState.Unlocked;
diff --git a/src/matter/to-matter/SocketToMatter.ts b/src/matter/to-matter/SocketToMatter.ts
index 0ef9886a..8405294a 100644
--- a/src/matter/to-matter/SocketToMatter.ts
+++ b/src/matter/to-matter/SocketToMatter.ts
@@ -6,15 +6,20 @@ import type Socket from '../../lib/devices/Socket';
 import type { IdentifyOptions } from './GenericDeviceToMatter';
 import { GenericElectricityDataDeviceToMatter } from './GenericElectricityDataDeviceToMatter';
 import { initializeMaintenanceStateHandlers } from './SharedStateHandlers';
+import { EventedOnOffPlugInUnitOnOffServer } from '../behaviors/EventedOnOffPlugInUnitOnOffServer';
+import { IoBrokerEvents } from '../behaviors/IoBrokerEvents';
+
+const IoBrokerOnOffPlugInUnitDevice = OnOffPlugInUnitDevice.with(EventedOnOffPlugInUnitOnOffServer, IoBrokerEvents);
+type IoBrokerOnOffPlugInUnitDevice = typeof IoBrokerOnOffPlugInUnitDevice;
 
 /** Mapping Logic to map a ioBroker Socket device to a Matter OnOffPlugInUnitDevice. */
 export class SocketToMatter extends GenericElectricityDataDeviceToMatter {
     readonly #ioBrokerDevice: Socket;
-    readonly #matterEndpoint: Endpoint<OnOffPlugInUnitDevice>;
+    readonly #matterEndpoint: Endpoint<IoBrokerOnOffPlugInUnitDevice>;
 
     constructor(ioBrokerDevice: GenericDevice, name: string, uuid: string) {
         super(name, uuid);
-        this.#matterEndpoint = new Endpoint(OnOffPlugInUnitDevice, { id: uuid });
+        this.#matterEndpoint = new Endpoint(IoBrokerOnOffPlugInUnitDevice, { id: uuid });
         this.#ioBrokerDevice = ioBrokerDevice as Socket;
         this.addElectricityDataClusters(this.#matterEndpoint, this.#ioBrokerDevice);
     }
@@ -41,7 +46,7 @@ export class SocketToMatter extends GenericElectricityDataDeviceToMatter {
     registerMatterHandlers(): void {
         // install matter listeners
         // here we can react on changes from the matter side for onOff
-        this.#matterEndpoint.events.onOff.onOff$Changed.on(async on => {
+        this.#matterEndpoint.events.ioBrokerEvents.onOffControlled.on(async on => {
             const currentValue = !!this.#ioBrokerDevice.getPower();
             if (on !== currentValue) {
                 await this.#ioBrokerDevice.setPower(on);