diff --git a/gateway/include/ha.h b/gateway/include/ha.h
index 2337936..64296b6 100644
--- a/gateway/include/ha.h
+++ b/gateway/include/ha.h
@@ -96,13 +96,27 @@ namespace Ha {
     
     List<Component> Component::components;
 
-    template <class T>
-    struct Builder {
+    struct AbstractBuilder {
+        static List<AbstractBuilder> builders;
+
+        AbstractBuilder() {
+            builders.add(this);
+        }
+
+        static void deleteAll() {
+            List<AbstractBuilder>::exec(builders, [](AbstractBuilder* builder)
+                                        { delete builder; });
+        }
+    };
+    List<AbstractBuilder> AbstractBuilder::builders;
+
+    template <class T = Component>
+    struct Builder : AbstractBuilder {
         T* cmp;
 
-        Builder() {}
-        Builder(T* cmp) : cmp(cmp) {}
-        Builder(const char* id) {
+        Builder() : AbstractBuilder() {}
+        Builder(T* cmp) :  AbstractBuilder(), cmp(cmp) {}
+        Builder(const char* id) : AbstractBuilder() {
             cmp = new T{id};
         }
 
diff --git a/gateway/include/mqtt.h b/gateway/include/mqtt.h
index fecea33..a3553ea 100644
--- a/gateway/include/mqtt.h
+++ b/gateway/include/mqtt.h
@@ -68,6 +68,7 @@ namespace Mqtt {
         Ha::publisher = publish;
         List<Component>::exec(Component::components, [](Component* c)
                               { publishComponentConfig(*c); });
+        AbstractBuilder::deleteAll();
         ts.deleteTask(tPublishInit);
     }