diff --git a/libs/visor_dns/PublicSuffixList.h b/libs/visor_dns/PublicSuffixList.h
index 33c4d977a..42e150fab 100644
--- a/libs/visor_dns/PublicSuffixList.h
+++ b/libs/visor_dns/PublicSuffixList.h
@@ -18,7 +18,7 @@ namespace visor::lib::dns {
 using namespace std::literals;
 
 // ===BEGIN ICANN DOMAINS===
-static const robin_hood::unordered_map<std::string_view, std::vector<std::string_view>> ICANN_DOMAINS = {
+static const robin_hood::unordered_node_map<std::string_view, std::vector<std::string_view>> ICANN_DOMAINS = {
     {"ac"sv, {"com.ac"sv, "edu.ac"sv, "gov.ac"sv, "net.ac"sv, "mil.ac"sv, "org.ac"sv}},
     {"ad"sv, {"nom.ad"sv}},
     {"ae"sv, {"co.ae"sv, "net.ae"sv, "org.ae"sv, "sch.ae"sv, "ac.ae"sv, "gov.ae"sv, "mil.ae"sv}},
diff --git a/libs/visor_transaction/TransactionManager.h b/libs/visor_transaction/TransactionManager.h
index 56eb9250a..4d9ed424f 100644
--- a/libs/visor_transaction/TransactionManager.h
+++ b/libs/visor_transaction/TransactionManager.h
@@ -51,7 +51,7 @@ template <typename XactID, typename TransactionType, typename Hash = hash_pair>
 class TransactionManager
 {
     static_assert(std::is_base_of<Transaction, TransactionType>::value, "TransactionType must inherit from Transaction structure");
-    typedef robin_hood::unordered_map<XactID, TransactionType, Hash> XactMap;
+    typedef robin_hood::unordered_node_map<XactID, TransactionType, Hash> XactMap;
 
     uint32_t _ttl_secs{0};
     uint32_t _ttl_ms{0};
diff --git a/src/VisorLRUList.h b/src/VisorLRUList.h
index 29bee6f7d..c6c04ccfb 100644
--- a/src/VisorLRUList.h
+++ b/src/VisorLRUList.h
@@ -27,7 +27,7 @@ class LRUList
 {
 public:
     typedef typename std::list<std::pair<T, V>>::iterator ListIterator;
-    typedef typename robin_hood::unordered_map<T, ListIterator>::iterator MapIterator;
+    typedef typename robin_hood::unordered_node_map<T, ListIterator>::iterator MapIterator;
 
     /**
      * A c'tor for this class
@@ -151,7 +151,7 @@ class LRUList
 
 private:
     std::list<std::pair<T, V>> m_CacheItemsList;
-    robin_hood::unordered_map<T, ListIterator> m_CacheItemsMap;
+    robin_hood::unordered_node_map<T, ListIterator> m_CacheItemsMap;
     size_t m_MaxSize;
 };
 
diff --git a/src/inputs/flow/NetflowData.h b/src/inputs/flow/NetflowData.h
index 123d5b840..cea33a089 100644
--- a/src/inputs/flow/NetflowData.h
+++ b/src/inputs/flow/NetflowData.h
@@ -53,8 +53,8 @@ struct hash_pair {
 };
 
 using NfMapID = std::pair<uint32_t, uint16_t>;
-static robin_hood::unordered_map<NfMapID, peer_nf9_template, hash_pair> nf9_template_map;
-static robin_hood::unordered_map<NfMapID, peer_nf10_template, hash_pair> nf10_template_map;
+static robin_hood::unordered_node_map<NfMapID, peer_nf9_template, hash_pair> nf9_template_map;
+static robin_hood::unordered_node_map<NfMapID, peer_nf10_template, hash_pair> nf10_template_map;
 
 static bool process_netflow_v1(NFSample *sample)
 {