diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
index 7010ae99c..f122d0ba2 100644
--- a/lib/framework/SecuritySettingsService.h
+++ b/lib/framework/SecuritySettingsService.h
@@ -32,8 +32,9 @@
 
 class SecuritySettings {
   public:
-    String          jwtSecret;
-    std::list<User> users;
+    String jwtSecret;
+    std::vector<User> users;
+    // std::list<User> users;
 
     static void read(SecuritySettings & settings, JsonObject root) {
         // secret
diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
index f6510cf25..80fa5f84e 100644
--- a/lib/framework/StatefulService.h
+++ b/lib/framework/StatefulService.h
@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include <ArduinoJson.h>
 
+#include <vector>
 #include <list>
 #include <functional>
 #include <freertos/FreeRTOS.h>
@@ -128,8 +129,9 @@ class StatefulService {
     }
 
   private:
-    SemaphoreHandle_t                   _accessMutex;
-    std::list<StateUpdateHandlerInfo_t> _updateHandlers;
+    SemaphoreHandle_t _accessMutex;
+    std::vector<StateUpdateHandlerInfo_t> _updateHandlers;
+    // std::list<StateUpdateHandlerInfo_t> _updateHandlers;
 };
 
 #endif
diff --git a/src/web/WebCustomEntityService.h b/src/web/WebCustomEntityService.h
index ab2cef9ba..7b81c3c31 100644
--- a/src/web/WebCustomEntityService.h
+++ b/src/web/WebCustomEntityService.h
@@ -43,7 +43,8 @@ class CustomEntityItem {
 
 class WebCustomEntity {
   public:
-    std::list<CustomEntityItem> customEntityItems;
+    std::vector<CustomEntityItem> customEntityItems;
+    // std::list<CustomEntityItem> customEntityItems;
 
     static void              read(WebCustomEntity & webEntity, JsonObject root);
     static StateUpdateResult update(JsonObject root, WebCustomEntity & webEntity);
@@ -78,8 +79,10 @@ class WebCustomEntityService : public StatefulService<WebCustomEntity> {
     HttpEndpoint<WebCustomEntity>  _httpEndpoint;
     FSPersistence<WebCustomEntity> _fsPersistence;
 
-    std::list<CustomEntityItem> * customEntityItems; // pointer to the list of entity items
-    bool                          ha_registered_ = false;
+    std::vector<CustomEntityItem> * customEntityItems; // pointer to the list of entity items
+    // std::list<CustomEntityItem> * customEntityItems; // pointer to the list of entity items
+
+    bool ha_registered_ = false;
 };
 
 } // namespace emsesp