diff --git a/roles/monitoring/templates/mqtt_exporter_config.yaml b/roles/monitoring/templates/mqtt_exporter_config.yaml
index 553883d..26df1ba 100644
--- a/roles/monitoring/templates/mqtt_exporter_config.yaml
+++ b/roles/monitoring/templates/mqtt_exporter_config.yaml
@@ -9,14 +9,24 @@ export:
   - subscribe: bitlair/#
   - subscribe: bitlair/climate/+location/#
   - subscribe: bitlair/wifi/+ssid/#
+
   - subscribe: bitlair/state
-    value_map:
-      open: 1
-      closed: 0
+    metric_type: enum
+    enum_states: [open, closed]
+
+  - subscribe: bitlair/state/djo
+    metric_type: enum
+    enum_states: [open, closed]
+
+  - subscribe: bitlair/doorduino/lockstate
+    metric_type: enum
+    enum_states: [open, closed]
+
   - subscribe: bitlair/pos/product
     metric_type: counter
     labels:
-      product: enum
+      product: payload
+
   - subscribe: bitlair/collectd/bitlair-5406/snmp/if_octets-traffic.D15
     metric_name: bitlair_internet_rx
     value_regex: "^.+:(.+):"
diff --git a/roles/mqtt-internal/templates/public-bridge.conf b/roles/mqtt-internal/templates/public-bridge.conf
index 75fb30c..0dc4b5d 100644
--- a/roles/mqtt-internal/templates/public-bridge.conf
+++ b/roles/mqtt-internal/templates/public-bridge.conf
@@ -5,6 +5,7 @@ address {{ mqtt_public_host }}
 
 topic bitlair/climate/# out
 topic bitlair/collectd/bitlair-5406/snmp/# out
+topic bitlair/doorduino/lockstate out
 topic bitlair/entrysensor/# out
 topic bitlair/humidity/+ out
 topic bitlair/lasercutter/+ out