diff --git a/.clang-format b/.clang-format
index b2b9dca..10bd3e0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -23,4 +23,6 @@ AllowShortLoopsOnASingleLine: false
 BreakAfterReturnType: None
 PenaltyReturnTypeOnItsOwnLine: 1000
 
+BreakTemplateDeclarations: Yes
+
 NamespaceIndentation: All
diff --git a/src/logos_blockchain_module.cpp b/src/logos_blockchain_module.cpp
index 44e9527..e6b9bf0 100644
--- a/src/logos_blockchain_module.cpp
+++ b/src/logos_blockchain_module.cpp
@@ -690,7 +690,7 @@ StdLogosResult LogosBlockchainModule::wallet_get_notes(
     obj["tip"] = bytes_to_hex(value.tip, TX_HASH_BYTES);
     json notes = json::array();
     for (size_t i = 0; i < value.len; ++i) {
-        const auto&[note_id, note_value] = value.notes[i];
+        const auto& [note_id, note_value] = value.notes[i];
         json n;
         n["id"] = bytes_to_hex(note_id, TX_HASH_BYTES);
         // Value is u64; serialized as a string to avoid JSON number precision loss.
@@ -894,7 +894,7 @@ StdLogosResult LogosBlockchainModule::wallet_get_claimable_vouchers() const {
     obj["vouchers"] = json::array();
 
     for (size_t i = 0; i < value.len; ++i) {
-        const auto&[commitment, nullifier] = value.vouchers[i];
+        const auto& [commitment, nullifier] = value.vouchers[i];
         obj["vouchers"].push_back({
             {"commitment", bytes_to_hex(reinterpret_cast<const uint8_t*>(&commitment), ADDRESS_BYTES)},
             {"nullifier", bytes_to_hex(reinterpret_cast<const uint8_t*>(&nullifier), ADDRESS_BYTES)},
diff --git a/src/logos_blockchain_module.h b/src/logos_blockchain_module.h
index 98f1969..df79054 100644
--- a/src/logos_blockchain_module.h
+++ b/src/logos_blockchain_module.h
@@ -136,11 +136,15 @@ public:
     // Cryptarchia
     [[nodiscard]] StdLogosResult get_cryptarchia_info() const;
 
-logos_events :
+    // clang-format off
+// Clang-format only handles public/private/protected, so it miss-indents this section.
+// Guard kept until https://github.com/llvm/llvm-project/issues/64763 lands.
+logos_events:
     // Fired by on_new_block_callback when the Rust node delivers a new block.
     // blockJson is the full block serialized as JSON.
     // ReSharper disable once CppFunctionIsNotImplemented
     void newBlock(const std::string& blockJson);
+    // clang-format on
 
 private:
     LogosBlockchainNode* node = nullptr;