diff --git a/app/src/trading/execution/position_actions.py b/app/src/trading/execution/position_actions.py
index 59efb04..36f1f9a 100644
--- a/app/src/trading/execution/position_actions.py
+++ b/app/src/trading/execution/position_actions.py
@@ -239,6 +239,15 @@ class ExecutionPositionActionsMixin(_ExecutionPositionActionsProtocol):
             "close_reason": close_reason,
             "is_forced": forced_reason is not None,
 
+            **build_runtime_payload(state),
+            **build_signal_payload(state),
+            **build_decision_payload(state),
+            **build_runtime_blocks_payload(state),
+            **build_execution_quality_payload(state),
+            **build_execution_price_payload(state),
+            **build_adaptive_size_payload(state),
+            **build_risk_settings_payload(state),
+
             # ---------- Instrument / Position ----------
             "symbol": state.symbol,
             "side": position.side,
@@ -282,14 +291,6 @@ class ExecutionPositionActionsMixin(_ExecutionPositionActionsProtocol):
             "cycle_trade_fees_usd_before": state.cycle_trade_fees_usd,
             "cycle_overnight_fees_usd_before": state.cycle_overnight_fees_usd,
 
-            **build_runtime_payload(state),
-            **build_signal_payload(state),
-            **build_decision_payload(state),
-            **build_runtime_blocks_payload(state),
-            **build_execution_quality_payload(state),
-            **build_execution_price_payload(state),
-            **build_adaptive_size_payload(state),
-            **build_risk_settings_payload(state),
             **build_position_health_payload(state),
             **build_position_intelligence_payload(state),
             **build_autonomous_payload(state),