diff --git a/.changelog/unreleased/bug-fixes/2685-replace-hash-data-structs.md b/.changelog/unreleased/bug-fixes/2685-replace-hash-data-structs.md
new file mode 100644
index 00000000000..e62f215e3b6
--- /dev/null
+++ b/.changelog/unreleased/bug-fixes/2685-replace-hash-data-structs.md
@@ -0,0 +1,3 @@
+- Use `indexmap` maps and sets in favor of `std` collections, to avoid
+  iteration order related bugs in the state machine code of Namada.
+  ([\#2685](https://github.com/anoma/namada/pull/2685))
\ No newline at end of file