diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index dda83cb7b..1589a2c02 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -27,6 +27,33 @@ const cfg = {
             value_template: '{{ value_json.sos }}',
         },
     },
+    'binary_sensor_alarm': {
+        type: 'binary_sensor',
+        object_id: 'alarm',
+        discovery_payload: {
+            payload_on: true,
+            payload_off: false,
+            value_template: '{{ value_json.alarm }}',
+        },
+    },
+    'binary_sensor_temperature_alarm': {
+        type: 'binary_sensor',
+        object_id: 'temperature_alarm',
+        discovery_payload: {
+            payload_on: true,
+            payload_off: false,
+            value_template: '{{ value_json.temperature_alarm }}',
+        },
+    },
+    'binary_sensor_humidity_alarm': {
+        type: 'binary_sensor',
+        object_id: 'humidity_alarm',
+        discovery_payload: {
+            payload_on: true,
+            payload_off: false,
+            value_template: '{{ value_json.humidity_alarm }}',
+        },
+    },
     'binary_sensor_presence': {
         type: 'binary_sensor',
         object_id: 'presence',
@@ -1821,6 +1848,12 @@ const mapping = {
     'ZSTY-SM-1CTZG-US-W': [cfg.cover_position],
     'ZSTY-SM-1DMZG-US-W': [cfg.light_brightness],
     'SNTZ009': [cfg.binary_sensor_water_leak],
+    '4058075208414': [cfg.light_brightness_colortemp],
+    '4058075208339': [cfg.light_brightness_colortemp_colorxy],
+    'NAS-AB02B0': [
+        cfg.sensor_temperature, cfg.sensor_humidity, cfg.binary_sensor_humidity_alarm,
+        cfg.binary_sensor_temperature_alarm, cfg.binary_sensor_alarm,
+    ],
 };
 
 const defaultStatusTopic = 'homeassistant/status';
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6718254ae..50b0df060 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -14834,9 +14834,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "12.0.156",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.156.tgz",
-      "integrity": "sha512-WywVYl6sJivMbVntR1LW0k6Vrlr14eF6wZRl4em0lZlXBJ6BUvEnXRG9yf/9WamJa2+MJz87/l8Or1L7bTm7kg==",
+      "version": "12.0.157",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.157.tgz",
+      "integrity": "sha512-hIyPDxIRC9U3a/c2DLJWVsy0uFpbvWdc6sZp5kENvfbuiJYhl/kYLNr/b5xqT+l86tUr9UAvUb5jgJXck1poKA==",
       "requires": {
         "axios": "^0.19.2",
         "https-proxy-agent": "^5.0.0",
diff --git a/package.json b/package.json
index a35e93691..3d8c2426e 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "winston": "^3.3.3",
     "winston-syslog": "^2.4.4",
     "zigbee-herdsman": "0.12.114",
-    "zigbee-herdsman-converters": "12.0.156"
+    "zigbee-herdsman-converters": "12.0.157"
   },
   "devDependencies": {
     "eslint": "*",