diff --git a/src/myStromSwitchAccessory.ts b/src/myStromSwitchAccessory.ts
index cd6dd54..7a8b99b 100644
--- a/src/myStromSwitchAccessory.ts
+++ b/src/myStromSwitchAccessory.ts
@@ -54,7 +54,7 @@ export class MyStromSwitchAccessory extends DingzDaBaseAccessory {
       )
       .setCharacteristic(
         this.platform.Characteristic.Model,
-        this.device.model as string,
+        `MyStrom WiFi Switch ${this.device.model as string}`,
       )
       .setCharacteristic(
         this.platform.Characteristic.FirmwareRevision,
@@ -62,7 +62,7 @@ export class MyStromSwitchAccessory extends DingzDaBaseAccessory {
       )
       .setCharacteristic(
         this.platform.Characteristic.HardwareRevision,
-        this.mystromDeviceInfo ? 'EU/CH v2/Zero' : 'CH v1',
+        this.device.model as string,
       )
       .setCharacteristic(
         this.platform.Characteristic.SerialNumber,