diff --git a/sensor_bridge.py b/sensor_bridge.py
index 1b6d42b..f819c2e 100644
--- a/sensor_bridge.py
+++ b/sensor_bridge.py
@@ -84,8 +84,8 @@ def read_and_publish_temperature_humidity(mqtt_client, modbus_client, host_info)
         topics_data = [
             (f"{base_topic}/Time", current_time),
             (f"{base_topic}/Status", "online"),
-            (f"{base_topic}/Temperature/temperature_value", round(temperature, 1)),
-            (f"{base_topic}/Humidity/humidity_value", round(humidity, 1)),
+            (f"{base_topic}/Temperature/temperature", round(temperature, 1)),
+            (f"{base_topic}/Humidity/humidity", round(humidity, 1)),
         ]
 
         all_published = True
@@ -143,9 +143,9 @@ def read_and_publish_cwt_co2(mqtt_client, modbus_client, host_info):
         topics_data = [
             (f"{base_topic}/Time", current_time),
             (f"{base_topic}/Status", "online"),
-            (f"{base_topic}/Temperature/temperature_value", round(temperature, 1)),
-            (f"{base_topic}/Humidity/humidity_value", round(humidity, 1)),
-            (f"{base_topic}/CO2/CO2_value", co2_ppm),
+            (f"{base_topic}/Temperature/temperature", round(temperature, 1)),
+            (f"{base_topic}/Humidity/humidity", round(humidity, 1)),
+            (f"{base_topic}/CO2/CO2", co2_ppm),
         ]
 
         all_published = True