diff --git a/rpi/main.py b/rpi/main.py
index 53fa4004..46d35401 100644
--- a/rpi/main.py
+++ b/rpi/main.py
@@ -54,20 +54,19 @@ def start_party():
 
 def start_brokers():
     forwarder = MQTTForwarder(client_id, local_broker, api_broker)
-    forwarder.start(f"/system/sensor/#", f"/customer/telemetry/{client_id}")
+    forwarder.start(f"/system/sensor/rfid", f"/customer/telemetry/rfid")
+
+    forwarder = MQTTForwarder(client_id, local_broker, api_broker)
+    forwarder.start(f"/system/sensor/light", f"/customer/telemetry/light")
 
 def start_serial_devices():
     screen.enableBackground()
     screen.displayMessage("Waiting for scan...")
 
-    rfid_reader.subscribe(lambda uid: local_broker.publish(
-        "/system/sensor/rfid", str(uid), 0
-    ))
+    rfid_reader.subscribe(lambda uid: local_broker.publish("/system/sensor/rfid", str(uid), 1))
     rfid_reader.start()
 
-    light_sensor_reader.subscribe(lambda light_value: local_broker.publish(
-        "/system/sensor/light", str(light_value), 0
-    ))
+    light_sensor_reader.subscribe(lambda light_value: local_broker.publish("/system/sensor/light", str(light_value), 0))
     light_sensor_reader.start()
 
 if __name__ == "__main__":