diff --git a/include/ha.h b/include/ha.h
index 0afc07f..7667155 100644
--- a/include/ha.h
+++ b/include/ha.h
@@ -91,6 +91,11 @@ namespace Ha {
             sprintf(commandTopic, "homeassistant/%s/esp_clock/%s/set", type, id);
         }
 
+        void buildConfig(JsonDocument& jsonDoc) override {
+            Command::buildConfig(jsonDoc);
+            jsonDoc["retain"] = true;
+        }
+
     };
 
     struct Brightness : Command {
@@ -102,6 +107,7 @@ namespace Ha {
 
         void buildConfig(JsonDocument& jsonDoc) override {
             Command::buildConfig(jsonDoc);
+            jsonDoc["retain"] = true;
             jsonDoc["min"] = BRIGHTNESS_MIN;
             jsonDoc["max"] = BRIGHTNESS_MAX;
             jsonDoc["step"] = BRIGHTNESS_STEP;
diff --git a/include/mqtt.h b/include/mqtt.h
index 85739d0..250cae9 100644
--- a/include/mqtt.h
+++ b/include/mqtt.h
@@ -116,9 +116,6 @@ namespace Mqtt {
         for (Ha::Component* cmp : switches) {
             publishComponentConfig(*cmp);
         }
-        brightnessMqtt->publishState();
-        hourFormatMqtt->publishState();
-        ledMqtt->publishState();
         ts.deleteTask(tPublishInit);
     }