diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 16d423cc9..62bcd5a0a 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -612,6 +612,14 @@ const mapping = {
         configurations.binary_sensor_occupancy, configurations.sensor_temperature,
         configurations.sensor_battery, configurations.binary_sensor_battery_low,
     ],
+    'NCZ-3041-HA': [
+        configurations.binary_sensor_occupancy, configurations.sensor_temperature,
+        configurations.sensor_battery, configurations.binary_sensor_battery_low,
+    ],
+    'NCZ-3045-HA': [
+        configurations.binary_sensor_occupancy, configurations.sensor_temperature,
+        configurations.sensor_battery, configurations.binary_sensor_battery_low,
+    ],
     'STS-IRM-250': [
         configurations.binary_sensor_occupancy, configurations.sensor_temperature,
         configurations.sensor_battery, configurations.binary_sensor_battery_low,
@@ -704,6 +712,9 @@ const mapping = {
     'A806S-Q1R': [configurations.light_brightness],
     'XY12S-15': [configurations.light_brightness_colortemp_colorxy],
     'B07KG5KF5R': [configurations.light_brightness_colortemp],
+    'SCM-S1': [configurations.cover_position],
+    'HEIMAN-M1': [configurations.binary_sensor_contact],
+    'HS1WD': [configurations.switch],
 };
 
 Object.keys(mapping).forEach((key) => {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 6c57647ac..4baac6427 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2475,9 +2475,9 @@
       "dev": true
     },
     "eslint-plugin-jest": {
-      "version": "22.6.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.6.3.tgz",
-      "integrity": "sha512-Db1b54TCPrxHYz4Mmn/jI48WIIlM6L7ajuyxpse8OjybkM+/xSmDGA46DLqnVe+JoShU+Dc3j6X6IEU4XfiLtw==",
+      "version": "22.6.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-22.6.4.tgz",
+      "integrity": "sha512-36OqnZR/uMCDxXGmTsqU4RwllR0IiB/XF8GW3ODmhsjiITKuI0GpgultWFt193ipN3HARkaIcKowpE6HBvRHNg==",
       "dev": true
     },
     "eslint-scope": {
@@ -5891,9 +5891,9 @@
       "dev": true
     },
     "semver": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
-      "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ=="
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.0.tgz",
+      "integrity": "sha512-kCqEOOHoBcFs/2Ccuk4Xarm/KiWRSLEX9CAZF8xkJ6ZPlIoTZ8V5f7J16vYLJqDbR7KrxTJpR2lqjIEm2Qx9cQ=="
     },
     "set-blocking": {
       "version": "2.0.0",
@@ -6322,9 +6322,9 @@
       "dev": true
     },
     "table": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.3.3.tgz",
-      "integrity": "sha512-3wUNCgdWX6PNpOe3amTTPWPuF6VGvgzjKCaO1snFj0z7Y3mUPWf5+zDtxUVGispJkDECPmR29wbzh6bVMOHbcw==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
+      "integrity": "sha512-nHFDrxmbrkU7JAFKqKbDJXfzrX2UBsWmrieXFTGxiI5e4ncg3VqsZeI4EzNmX0ncp4XNGVeoxIWJXfCIXwrsvw==",
       "dev": true,
       "requires": {
         "ajv": "^6.9.1",
@@ -7017,9 +7017,9 @@
       }
     },
     "zigbee-shepherd-converters": {
-      "version": "9.0.16",
-      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-9.0.16.tgz",
-      "integrity": "sha512-uFATjeYdzhy5hF/KOLcs6NO3S3T8V2/+GB2Cr1krPceymj0YMrr2xgeTju8kNVZKX5+MjJHV994YYsMD3i3WNw==",
+      "version": "9.0.17",
+      "resolved": "https://registry.npmjs.org/zigbee-shepherd-converters/-/zigbee-shepherd-converters-9.0.17.tgz",
+      "integrity": "sha512-JLNdmtQtjvWLZLPXzGGdeSxnlhQceNKvA+bBmk+bPja5Lc5jiwSclhjxxxfpjXBoGKLlm3Gk5a8PuL8oYgB50Q==",
       "requires": {
         "chai": "*",
         "debounce": "*",
diff --git a/package.json b/package.json
index ca9b63db6..9be1ac5cf 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "zcl-id": "git+https://github.com/Koenkk/zcl-id.git#4fa75c92424cd070a3bf6e1f4640b1e3ad8f802d",
     "ziee": "*",
     "zigbee-shepherd": "git+https://github.com/Koenkk/zigbee-shepherd.git#f6dc5b4469a87c90007dfc9f0d329cdb01d35072",
-    "zigbee-shepherd-converters": "9.0.16",
+    "zigbee-shepherd-converters": "9.0.17",
     "deep-diff": "*",
     "zive": "*"
   },