diff --git a/src/mqtt/HomeAssistantStatic.h b/src/mqtt/HomeAssistantStatic.h
index 8f781d6f..7bb251ce 100644
--- a/src/mqtt/HomeAssistantStatic.h
+++ b/src/mqtt/HomeAssistantStatic.h
@@ -17,17 +17,17 @@ const uint8_t HA_SENSOR_COUNT PROGMEM = 60;
 HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = {
     {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "\"measurement\""},
     {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "\"measurement\""},
-    {"Temperature",                "/state",   "temp",              "C",    "temperature",     "\"measurement\""},
+    {"Temperature",                "/state",   "temp",              "°C",   "temperature",     "\"measurement\""},
     {"Active import",              "/power",   "P",                 "W",    "power",           "\"measurement\""},
     {"L1 active import",           "/power",   "P1",                "W",    "power",           "\"measurement\""},
     {"L2 active import",           "/power",   "P2",                "W",    "power",           "\"measurement\""},
     {"L3 active import",           "/power",   "P3",                "W",    "power",           "\"measurement\""},
-    {"Reactive import",            "/power",   "Q",                 "VAr",  "reactive_power",  "\"measurement\""},
+    {"Reactive import",            "/power",   "Q",                 "var",  "reactive_power",  "\"measurement\""},
     {"Active export",              "/power",   "PO",                "W",    "power",           "\"measurement\""},
     {"L1 active export",           "/power",   "PO1",               "W",    "power",           "\"measurement\""},
     {"L2 active export",           "/power",   "PO2",               "W",    "power",           "\"measurement\""},
     {"L3 active export",           "/power",   "PO3",               "W",    "power",           "\"measurement\""},
-    {"Reactive export",            "/power",   "QO",                "VAr",  "reactive_power",  "\"measurement\""},
+    {"Reactive export",            "/power",   "QO",                "var",  "reactive_power",  "\"measurement\""},
     {"L1 current",                 "/power",   "I1",                "A",    "current",         "\"measurement\""},
     {"L2 current",                 "/power",   "I2",                "A",    "current",         "\"measurement\""},
     {"L3 current",                 "/power",   "I3",                "A",    "current",         "\"measurement\""},
@@ -36,8 +36,8 @@ HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = {
     {"L3 voltage",                 "/power",   "U3",                "V",    "voltage",         "\"measurement\""},
     {"Accumulated active import",  "/energy",  "tPI",               "kWh",  "energy",          "\"total_increasing\""},
     {"Accumulated active export",  "/energy",  "tPO",               "kWh",  "energy",          "\"total_increasing\""},
-    {"Accumulated reactive import","/energy",  "tQI",               "kVArh","energy",          "\"total_increasing\""},
-    {"Accumulated reactive export","/energy",  "tQO",               "kVArh","energy",          "\"total_increasing\""},
+    {"Accumulated reactive import","/energy",  "tQI",               "kvarh","energy",          "\"total_increasing\""},
+    {"Accumulated reactive export","/energy",  "tQO",               "kvarh","energy",          "\"total_increasing\""},
     {"Power factor",               "/power",   "PF",                "",     "power_factor",    "\"measurement\""},
     {"L1 power factor",            "/power",   "PF1",               "",     "power_factor",    "\"measurement\""},
     {"L2 power factor",            "/power",   "PF2",               "",     "power_factor",    "\"measurement\""},