diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
index 1ac2a1e3b6..4fd9ca94a6 100644
--- a/main/ZgatewayBT.ino
+++ b/main/ZgatewayBT.ino
@@ -1121,6 +1121,15 @@ void PublishDeviceData(JsonObject& BLEdata) {
   if (abs((int)BLEdata["rssi"] | 0) < abs(BTConfig.minRssi)) { // process only the devices close enough
     // Decode the payload
     process_bledata(BLEdata);
+    // Convert prmacs to RMACS until and if OMG gets Identity MAC/IRK decoding
+    if (BLEdata["prmac"]) {
+      BLEdata.remove("prmac");
+      if (BLEdata["track"]) {
+        BLEdata.remove("track");
+      }
+      BLEdata["type"] = "RMAC";
+      Log.trace(F("Potential RMAC (prmac) converted to RMAC" CR));
+    }
     // If the device is a random MAC and pubRandomMACs is false we don't publish this payload
     if (!BTConfig.pubRandomMACs && (BLEdata["type"].as<string>()).compare("RMAC") == 0) {
       Log.trace(F("Random MAC, device filtered" CR));
diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index 81ccad08b9..24b1f452ec 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -195,6 +195,7 @@ const char* availableHASSClasses[] = {"battery",
                                       "humidity",
                                       "illuminance",
                                       "irradiance",
+                                      "lock",
                                       "motion",
                                       "moving",
                                       "pm10",
diff --git a/platformio.ini b/platformio.ini
index 2c93876b89..1e612c9265 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -154,7 +154,7 @@ somfy_remote=Somfy_Remote_Lib@0.3.0
 rtl_433_ESP = https://github.com/NorthernMan54/rtl_433_ESP.git#v0.3.2
 emodbus =  miq19/eModbus@1.0.0
 gfSunInverter = https://github.com/BlackSmith/GFSunInverter.git#v1.0.1
-decoder = https://github.com/theengs/decoder.git#v1.6.4
+decoder = https://github.com/theengs/decoder.git#v1.6.7
 ssd1306 = https://github.com/ThingPulse/esp8266-oled-ssd1306.git#f96fd6a
 lm75 = jeremycole/I2C Temperature Sensors derived from the LM75@^1.0.3
 rn8209 = https://github.com/theengs/RN8209C-SDK.git#arduino