diff --git a/main.py b/main.py
index be67280..9b5636a 100644
--- a/main.py
+++ b/main.py
@@ -176,6 +176,7 @@ def main():
         
         # Build JSON Payloads
         dht_data = {
+            'Location':mqtt_config.MQTT_ZONE_ID,
             'Temperature':temp,
             'Relative Humidity':hum,
         }
@@ -184,6 +185,7 @@ def main():
         hw_data = {
             'Timestamp':timestamp,
             'CPU Temperature':cpu_temp,
+            'Device':mqtt_config.MQTT_HW_ID,
             'WiFi Information':ifconfig,
         }
         hw_payload = json.dumps(hw_data)