diff --git a/src/core/command.h b/src/core/command.h
index 61fcb9c49..6ab6b1230 100644
--- a/src/core/command.h
+++ b/src/core/command.h
@@ -19,7 +19,7 @@
 #ifndef EMSESP_COMMAND_H_
 #define EMSESP_COMMAND_H_
 
-#include <unordered_map>
+#include <map>
 
 #include "console.h"
 #include <esp32-psram.h>
@@ -153,8 +153,8 @@ class Command {
 
 class SUrlParser {
   private:
-    std::unordered_map<std::string, std::string> m_keysvalues;
-    std::vector<std::string>                     m_folders;
+    std::map<std::string, std::string> m_keysvalues;
+    std::vector<std::string>           m_folders;
 
   public:
     SUrlParser() = default;
@@ -166,7 +166,7 @@ class SUrlParser {
         return m_folders;
     };
 
-    std::unordered_map<std::string, std::string> & params() {
+    std::map<std::string, std::string> & params() {
         return m_keysvalues;
     };
 
diff --git a/src/core/emsdevice.cpp b/src/core/emsdevice.cpp
index 29f0cdffb..7e96e4479 100644
--- a/src/core/emsdevice.cpp
+++ b/src/core/emsdevice.cpp
@@ -1720,8 +1720,8 @@ void EMSdevice::get_value_json(JsonObject json, DeviceValue & dv) {
 
 // generate Prometheus metrics format from device values
 std::string EMSdevice::get_metrics_prometheus(const int8_t tag) {
-    std::string                           result;
-    std::unordered_map<std::string, bool> seen_metrics;
+    std::string                 result;
+    std::map<std::string, bool> seen_metrics;
 
     // Helper function to check if a device value type is supported for Prometheus metrics
     auto is_supported_type = [](uint8_t type) -> bool {
diff --git a/src/core/emsdevice.h b/src/core/emsdevice.h
index efd535693..93675ade7 100644
--- a/src/core/emsdevice.h
+++ b/src/core/emsdevice.h
@@ -26,7 +26,7 @@
 #include "emsdevicevalue.h"
 
 #include <esp32-psram.h>
-#include <unordered_map>
+#include <map>
 
 namespace emsesp {
 
diff --git a/src/core/emsesp.h b/src/core/emsesp.h
index b3ed04267..416c1bea7 100644
--- a/src/core/emsesp.h
+++ b/src/core/emsesp.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <functional>
 #include <deque>
-#include <unordered_map>
+#include <map>
 #include <list>
 
 #include <ArduinoJson.h>
diff --git a/src/core/emsfactory.h b/src/core/emsfactory.h
index 8f7f400f0..44e78b607 100644
--- a/src/core/emsfactory.h
+++ b/src/core/emsfactory.h
@@ -20,7 +20,7 @@
 #define EMSESP_EMSFACTORY_H_
 
 #include <memory> // for unique_ptr
-#include <unordered_map>
+#include <map>
 
 // Forward declaration
 namespace emsesp {
@@ -45,7 +45,7 @@ class EMSFactory {
         reg[device_type] = factory;
     }
 
-    using FactoryMap = std::unordered_map<uint8_t, EMSFactory *>;
+    using FactoryMap = std::map<uint8_t, EMSFactory *>;
 
     // returns all registered classes (really only for debugging)
     static auto device_handlers() -> const FactoryMap & {
@@ -76,7 +76,7 @@ class EMSFactory {
     static auto makeRaw(const uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand)
         -> EMSdevice * {
         auto & reg = EMSFactory::getRegister();
-        auto  it   = reg.find(device_type);
+        auto   it  = reg.find(device_type);
         if (it != reg.end()) {
             return it->second->construct(device_type, device_id, product_id, version, name, flags, brand);
         }
diff --git a/src/core/system.cpp b/src/core/system.cpp
index d031a05f2..f523c68b7 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1761,8 +1761,8 @@ void System::get_value_json(JsonObject output, const std::string & circuit, cons
 
 // generate Prometheus metrics format from system values
 std::string System::get_metrics_prometheus() {
-    std::string                           result;
-    std::unordered_map<std::string, bool> seen_metrics;
+    std::string                 result;
+    std::map<std::string, bool> seen_metrics;
 
     result.reserve(16000);
 
diff --git a/src/devices/connect.h b/src/devices/connect.h
index ea846c2b8..bbe647119 100644
--- a/src/devices/connect.h
+++ b/src/devices/connect.h
@@ -68,7 +68,7 @@ class Connect : public EMSdevice {
     bool set_childlock(const char * value, const int8_t id);
     bool set_icon(const char * value, const int8_t id);
 
-    std::vector<std::shared_ptr<Connect::RoomCircuit>> room_circuits_;
+    std::vector<std::shared_ptr<Connect::RoomCircuit>, AllocatorPSRAM<std::shared_ptr<Connect::RoomCircuit>>> room_circuits_;
 
     void    process_OutdoorTemp(std::shared_ptr<const Telegram> telegram);
     void    process_RCTime(std::shared_ptr<const Telegram> telegram);