diff --git a/Cargo.toml b/Cargo.toml
index 92e542c1..4f67ccc1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ uuid = { version = "1.3.0", features = [
   "serde",
 ] }
 reqwest = { version = "0.11", features = ["json"] }
-mostro-core = "0.4.5"
+mostro-core = { git = "https://github.com/bilthon/mostro-core.git", branch = "feat_pubkeys_to_smallorder" }
 tracing = "0.1.37"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
 config = "0.13.3"
diff --git a/src/app/add_invoice.rs b/src/app/add_invoice.rs
index 845c701d..cf01f294 100644
--- a/src/app/add_invoice.rs
+++ b/src/app/add_invoice.rs
@@ -134,7 +134,9 @@ pub async fn add_invoice_action(
             order.buyer_pubkey.as_ref().cloned(),
             order.seller_pubkey.as_ref().cloned(),
             None,
-            None,
+            Some(order.created_at),
+            order.buyer_pubkey.clone(),
+            order.seller_pubkey.clone(),
         );
         // We publish a new replaceable kind nostr event with the status updated
         // and update on local database the status and new event id
diff --git a/src/flow.rs b/src/flow.rs
index 18cabc2d..d553a542 100644
--- a/src/flow.rs
+++ b/src/flow.rs
@@ -52,7 +52,9 @@ pub async fn hold_invoice_paid(hash: &str) {
         None,
         None,
         None,
-        None,
+        Some(order.created_at),
+        order.buyer_pubkey.clone(),
+        order.seller_pubkey.clone(),
     );
     let status;
 
diff --git a/src/util.rs b/src/util.rs
index b9929a58..4b0e45c3 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -417,7 +417,9 @@ pub async fn set_market_order_sats_amount(
         None,
         None,
         None,
+        Some(order.created_at),
         None,
+        None
     );
     // We create a Message
     let message = Message::new_order(