diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index b3ca81338..997fa7725 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -311,6 +311,15 @@ const cfg = {
             value_template: '{{ value_json.temperature }}',
         },
     },
+    'sensor_device_temperature': {
+        type: 'sensor',
+        object_id: 'device_temperature',
+        discovery_payload: {
+            unit_of_measurement: '°C',
+            device_class: 'temperature',
+            value_template: '{{ value_json.device_temperature }}',
+        },
+    },
     'sensor_local_temperature': {
         type: 'sensor',
         object_id: 'local_temperature',
@@ -1301,7 +1310,8 @@ const mapping = {
     ],
     'T18W3Z': [switchEndpoint('l1'), switchEndpoint('l2'), switchEndpoint('l3')],
     'LVS-SM10ZW': [cfg.binary_sensor_contact, cfg.binary_sensor_battery_low],
-    'HS2SK': [cfg.switch, cfg.sensor_power],
+    'HS2SK': [cfg.switch, cfg.sensor_power, cfg.sensor_voltage, cfg.sensor_current],
+    'HS2SS': [cfg.sensor_action, cfg.sensor_battery],
     '45853GE': [cfg.switch, cfg.sensor_power],
     '50064': [cfg.light_brightness_colortemp],
     '9290011998B': [cfg.light_brightness_colortemp],
@@ -1662,6 +1672,7 @@ const mapping = {
         cfg.sensor_battery, cfg.sensor_temperature, cfg.sensor_humidity, cfg.sensor_battery_state,
         cfg.sensor_voc, cfg.sensor_pm25, cfg.sensor_pm10, cfg.sensor_hcho, cfg.sensor_aqi,
     ],
+    'HS2IRC': [cfg.sensor_battery],
     'B01M7Y8BP9': [cfg.sensor_action],
     'GP-WOU019BBDWG': [cfg.switch, cfg.sensor_power, cfg.sensor_energy],
     'AV2010/21A': [cfg.binary_sensor_battery_low, cfg.binary_sensor_contact, cfg.binary_sensor_tamper],
@@ -1724,9 +1735,12 @@ const mapping = {
     '4512702': [cfg.sensor_action, cfg.sensor_battery],
     '4090331P9': [cfg.light_brightness_colortemp_colorxy],
     'HS1EB/HS1EB-E': [cfg.sensor_click, cfg.sensor_action, cfg.sensor_battery],
-    'HS2SW1A-N': [cfg.switch],
-    'HS2SW2A-N': [switchEndpoint('left'), switchEndpoint('right')],
-    'HS2SW3A-N': [switchEndpoint('left'), switchEndpoint('right'), switchEndpoint('center')],
+    'HS2SW1A/HS2SW1A-N': [cfg.switch, cfg.sensor_device_temperature],
+    'HS2SW2A/HS2SW2A-N': [switchEndpoint('left'), switchEndpoint('right'), cfg.sensor_device_temperature],
+    'HS2SW3A/HS2SW3A-N': [
+        switchEndpoint('left'), switchEndpoint('right'),
+        switchEndpoint('center'), cfg.sensor_device_temperature,
+    ],
     'MCLH-07': [cfg.binary_sensor_water_leak, cfg.sensor_battery],
     'MCLH-04': [cfg.binary_sensor_contact, cfg.sensor_battery],
     'MCLH-02': [cfg.light_brightness_colortemp_colorxy],