diff --git a/src/HomeAssistantDiscovery.cpp b/src/HomeAssistantDiscovery.cpp
index 9cd6812..972cdf3 100644
--- a/src/HomeAssistantDiscovery.cpp
+++ b/src/HomeAssistantDiscovery.cpp
@@ -284,7 +284,7 @@ void HomeAssistantDiscovery::publishHASSNukiHubConfig()
                      "nuki_hub_version",
                      _nukiHubUidString,
                      "_nuki_hub_version",
-                     "Nuki Hub version",
+                     "Version",
                      _hostname.c_str(),
                      _baseTopic.c_str(),
                      String("~") + mqtt_topic_info_nuki_hub_version,
@@ -303,7 +303,7 @@ void HomeAssistantDiscovery::publishHASSNukiHubConfig()
                      "nuki_hub_build",
                      _nukiHubUidString,
                      "_nuki_hub_build",
-                     "Nuki Hub build",
+                     "Build",
                      _hostname.c_str(),
                      _baseTopic.c_str(),
                      String("~") + mqtt_topic_info_nuki_hub_build,
@@ -356,7 +356,7 @@ void HomeAssistantDiscovery::publishHASSNukiHubConfig()
                          "nuki_hub_latest",
                          _nukiHubUidString,
                          "_nuki_hub_latest",
-                         "Nuki Hub latest",
+                         "Latest Version",
                          _hostname.c_str(),
                          _baseTopic.c_str(),
                          String("~") + mqtt_topic_info_nuki_hub_latest,
@@ -381,7 +381,7 @@ void HomeAssistantDiscovery::publishHASSNukiHubConfig()
                              "nuki_hub_update",
                              _nukiHubUidString,
                              "_nuki_hub_update",
-                             "Nuki Hub firmware update",
+                             "Firmware update",
                              _hostname.c_str(),
                              _baseTopic.c_str(),
                              String("~") + mqtt_topic_info_nuki_hub_version,
@@ -403,7 +403,7 @@ void HomeAssistantDiscovery::publishHASSNukiHubConfig()
                              "nuki_hub_update",
                              _nukiHubUidString,
                              "_nuki_hub_update",
-                             "Nuki Hub firmware update",
+                             "Firmware update",
                              _hostname.c_str(),
                              _baseTopic.c_str(),
                              String("~") + mqtt_topic_info_nuki_hub_version,