diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index b747208f1..2cd5ccedc 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1889,6 +1889,9 @@ const mapping = {
     'TS0215A': [cfg.sensor_battery, cfg.sensor_action],
     '4713406': [cfg.light_brightness],
     '3216131P6': [cfg.light_brightness_colortemp],
+    'GWA1521': [cfg.switch],
+    'GWA1522': [switchEndpoint('l1'), switchEndpoint('l2')],
+    'GWA1531': [cfg.cover_position],
 };
 
 const defaultStatusTopic = 'homeassistant/status';
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 20f6ea0f3..e91d9117d 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -15025,9 +15025,9 @@
       }
     },
     "zigbee-herdsman-converters": {
-      "version": "12.0.166",
-      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.166.tgz",
-      "integrity": "sha512-kloe52UgTmXyakCJHV00UrNT4TV+cXzD4S2OIG5WWGUMxyNSk0vUwnM1nwK2gyTt5dzdMIbQ6QT+JdeJYnsJBg==",
+      "version": "12.0.167",
+      "resolved": "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-12.0.167.tgz",
+      "integrity": "sha512-/S1cdbvnOAy/CfeHYHbLhrRaMSVsKli51ViRz64LSB/hjZFpaeFVrOO/hwJ78jF+xCPbUHFlJbuW0344JYGzgw==",
       "requires": {
         "axios": "^0.19.2",
         "https-proxy-agent": "^5.0.0",
diff --git a/package.json b/package.json
index 33d44e51d..ae038d520 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "winston": "^3.3.3",
     "winston-syslog": "^2.4.4",
     "zigbee-herdsman": "0.12.119",
-    "zigbee-herdsman-converters": "12.0.166"
+    "zigbee-herdsman-converters": "12.0.167"
   },
   "devDependencies": {
     "eslint": "*",
diff --git a/test/publish.test.js b/test/publish.test.js
index b82a5b57f..c4fcac23a 100644
--- a/test/publish.test.js
+++ b/test/publish.test.js
@@ -896,7 +896,7 @@ describe('Publish', () => {
         await zigbeeHerdsman.events.message({data: {currentLevel: 1}, cluster: 'genLevelCtrl', device, endpoint, type: 'attributeReport', linkquality: 10});
         await flushPromises();
         expect(MQTT.publish).toHaveBeenCalledTimes(2);
-        expect(MQTT.publish.mock.calls[1]).toEqual(["zigbee2mqtt/bulb_color", stringify({state: 'OFF', brightness: 1, linkquality: 10}), {"qos": 0, "retain": false}, expect.any(Function)]);
+        expect(MQTT.publish.mock.calls[1]).toEqual(["zigbee2mqtt/bulb_color", stringify({state: 'OFF', brightness: 0, linkquality: 10}), {"qos": 0, "retain": false}, expect.any(Function)]);
 
         // Turn on again
         await MQTT.events.message('zigbee2mqtt/bulb_color/set', stringify({state: 'ON', transition: 3}));