diff --git a/Cargo.lock b/Cargo.lock
index c239e76..963e59c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3389,7 +3389,7 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 [[package]]
 name = "logos-blockchain-api-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3415,7 +3415,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-blend-crypto",
  "logos-blockchain-blend-message",
@@ -3427,7 +3427,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-crypto"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "blake2",
  "logos-blockchain-groth16",
@@ -3441,7 +3441,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-message"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "blake2",
  "derivative",
@@ -3463,7 +3463,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-network"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "either",
  "futures",
@@ -3481,7 +3481,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-proofs"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ed25519-dalek",
  "generic-array 1.3.5",
@@ -3496,7 +3496,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-scheduling"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "derivative",
@@ -3519,7 +3519,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-blend-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "fork_stream",
@@ -3554,7 +3554,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-chain-broadcast-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "derivative",
@@ -3570,7 +3570,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-chain-leader-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
@@ -3586,6 +3586,7 @@ dependencies = [
  "logos-blockchain-tx-service",
  "logos-blockchain-wallet-service",
  "overwatch",
+ "rand 0.8.5",
  "serde",
  "thiserror 1.0.69",
  "tokio",
@@ -3596,7 +3597,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-chain-network-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
@@ -3624,7 +3625,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-chain-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3654,7 +3655,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-chain-service-common"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-core",
  "serde",
@@ -3663,7 +3664,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-circuits-prover"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-circuits-utils",
  "tempfile",
@@ -3672,7 +3673,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-circuits-utils"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "dirs",
 ]
@@ -3680,7 +3681,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-common-http-client"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "futures",
  "logos-blockchain-chain-broadcast-service",
@@ -3697,7 +3698,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-core"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ark-ff 0.4.2",
  "bincode",
@@ -3726,7 +3727,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-cryptarchia-engine"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "cfg_eval",
  "logos-blockchain-utils",
@@ -3741,7 +3742,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-cryptarchia-sync"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "bytes",
  "futures",
@@ -3760,7 +3761,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-groth16"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ark-bn254 0.4.0",
  "ark-ec 0.4.2",
@@ -3778,7 +3779,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-http-api-common"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "axum",
  "governor",
@@ -3793,7 +3794,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-key-management-system-keys"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -3819,7 +3820,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-key-management-system-macros"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3829,7 +3830,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-key-management-system-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "log",
@@ -3844,8 +3845,9 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-ledger"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
+ "derivative",
  "logos-blockchain-blend-crypto",
  "logos-blockchain-blend-message",
  "logos-blockchain-blend-proofs",
@@ -3867,7 +3869,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-libp2p"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "backon",
@@ -3896,7 +3898,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-mmr"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ark-ff 0.4.2",
  "logos-blockchain-groth16",
@@ -3908,7 +3910,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-network-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
@@ -3927,7 +3929,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-node"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "axum",
@@ -3984,7 +3986,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-pol"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-circuits-prover",
  "logos-blockchain-circuits-utils",
@@ -4000,7 +4002,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-poq"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-circuits-prover",
  "logos-blockchain-circuits-utils",
@@ -4016,7 +4018,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-poseidon2"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ark-bn254 0.4.0",
  "ark-ff 0.4.2",
@@ -4027,25 +4029,23 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-sdp-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
  "logos-blockchain-core",
  "logos-blockchain-key-management-system-keys",
- "logos-blockchain-tx-service",
  "overwatch",
  "serde",
  "thiserror 2.0.18",
  "tokio",
- "tokio-stream",
  "tracing",
 ]
 
 [[package]]
 name = "logos-blockchain-services-utils"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
@@ -4060,7 +4060,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-storage-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -4078,7 +4078,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-system-sig-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-ctrlc",
  "async-trait",
@@ -4089,7 +4089,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-time-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "cfg_eval",
@@ -4111,7 +4111,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-tracing"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "opentelemetry",
  "opentelemetry-http",
@@ -4134,7 +4134,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-tracing-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "logos-blockchain-tracing",
@@ -4148,7 +4148,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-tx-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "futures",
@@ -4170,7 +4170,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-utils"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "blake2",
@@ -4187,7 +4187,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-utxotree"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "ark-ff 0.4.2",
  "logos-blockchain-core",
@@ -4202,7 +4202,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-wallet"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-core",
  "logos-blockchain-key-management-system-keys",
@@ -4216,7 +4216,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-wallet-service"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -4240,7 +4240,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-witness-generator"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "tempfile",
 ]
@@ -4248,7 +4248,7 @@ dependencies = [
 [[package]]
 name = "logos-blockchain-zksign"
 version = "0.1.0"
-source = "git+https://github.com/logos-co/nomos-node.git?rev=47ae18e95f643bde563b4769212b37f6f018fed3#47ae18e95f643bde563b4769212b37f6f018fed3"
+source = "git+https://github.com/logos-co/nomos-node.git?rev=deea611ef2afa0115f6c1a8743a5a2703c24891f#deea611ef2afa0115f6c1a8743a5a2703c24891f"
 dependencies = [
  "logos-blockchain-circuits-prover",
  "logos-blockchain-circuits-utils",
diff --git a/Cargo.toml b/Cargo.toml
index c262329..a4e9e03 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,39 +40,39 @@ testing-framework-runner-local   = { default-features = false, path = "testing-f
 testing-framework-workflows      = { default-features = false, path = "testing-framework/workflows" }
 
 # Logos git dependencies (pinned to latest master)
-broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
+broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-broadcast-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
 cfgsync_tf = { default-features = false, path = "testing-framework/tools/cfgsync_tf" }
 chain-leader = { default-features = false, features = [
   "pol-dev-mode",
-], git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
-zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "47ae18e95f643bde563b4769212b37f6f018fed3" }
+], git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-leader-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+chain-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-network-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+chain-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-chain-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+common-http-client = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-common-http-client", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+cryptarchia-engine = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-engine", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+cryptarchia-sync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-cryptarchia-sync", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+groth16 = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-groth16", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+key-management-system-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-key-management-system-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-api = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-api-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-blend-message = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-message", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-blend-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-blend-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-core = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-core", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-http-api-common = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-http-api-common", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-ledger = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-ledger", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-libp2p = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-libp2p", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-network = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-network-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-node = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-node", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-sdp = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-sdp-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-time = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-time-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-tracing = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-tracing-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tracing-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-utils = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-utils", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+nomos-wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+poc = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-poc", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+pol = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-pol", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+tests = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tests", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+tx-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-tx-service", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+wallet = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-wallet", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
+zksign = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", package = "logos-blockchain-zksign", rev = "deea611ef2afa0115f6c1a8743a5a2703c24891f" }
 
 # External crates
 async-trait      = { default-features = false, version = "0.1" }
diff --git a/testing-framework/configs/src/nodes/node.rs b/testing-framework/configs/src/nodes/node.rs
index 33692ae..3100227 100644
--- a/testing-framework/configs/src/nodes/node.rs
+++ b/testing-framework/configs/src/nodes/node.rs
@@ -1,7 +1,10 @@
+use key_management_system_service::keys::secured_key::SecuredKey as _;
+use nomos_core::mantle::Value;
 use nomos_node::{
-    Config as NodeConfig, RocksBackendSettings, config::deployment::DeploymentSettings,
+    RocksBackendSettings, UserConfig,
+    config::{RunConfig, deployment::DeploymentSettings},
 };
-use nomos_sdp::SdpSettings;
+use nomos_sdp::{SdpSettings, wallet::SdpWalletConfig};
 
 use crate::{
     nodes::{
@@ -16,7 +19,7 @@ use crate::{
 };
 
 #[must_use]
-pub fn create_node_config(config: GeneralConfig) -> NodeConfig {
+pub fn create_node_config(config: GeneralConfig) -> RunConfig {
     let network_config = config.network_config.clone();
     let (blend_user_config, blend_deployment, network_deployment) =
         build_blend_service_config(&config.blend_config);
@@ -24,20 +27,30 @@ pub fn create_node_config(config: GeneralConfig) -> NodeConfig {
     let deployment_settings =
         build_node_deployment_settings(&config, blend_deployment, network_deployment);
 
-    NodeConfig {
+    let user_settings = UserConfig {
         network: network_config,
         blend: blend_user_config,
-        deployment: deployment_settings,
         cryptarchia: cryptarchia_config(&config),
         tracing: tracing_settings(&config),
         http: http_config(&config),
         storage: rocks_storage_settings(),
         time: time_config(&config),
         mempool: mempool_config(),
-        sdp: SdpSettings { declaration: None },
+        sdp: SdpSettings {
+            declaration: None,
+            wallet_config: SdpWalletConfig {
+                max_tx_fee: Value::MAX,
+                funding_pk: config.consensus_config.funding_sk.as_public_key(),
+            },
+        },
         testing_http: testing_http_config(&config),
         wallet: wallet_settings(&config),
         key_management: config.kms_config.clone(),
+    };
+
+    RunConfig {
+        deployment: deployment_settings,
+        user: user_settings,
     }
 }
 
@@ -46,13 +59,13 @@ fn build_node_deployment_settings(
     blend_deployment: nomos_node::config::blend::deployment::Settings,
     network_deployment: nomos_node::config::network::deployment::Settings,
 ) -> DeploymentSettings {
-    DeploymentSettings::new_custom(
-        blend_deployment,
-        network_deployment,
-        cryptarchia_deployment(config),
-        time_deployment(config),
-        mempool_deployment(),
-    )
+    DeploymentSettings {
+        blend: blend_deployment,
+        network: network_deployment,
+        cryptarchia: cryptarchia_deployment(config),
+        time: time_deployment(config),
+        mempool: mempool_deployment(),
+    }
 }
 
 fn rocks_storage_settings() -> RocksBackendSettings {
diff --git a/testing-framework/configs/src/topology/configs/consensus.rs b/testing-framework/configs/src/topology/configs/consensus.rs
index 0a61005..bed29a0 100644
--- a/testing-framework/configs/src/topology/configs/consensus.rs
+++ b/testing-framework/configs/src/topology/configs/consensus.rs
@@ -104,6 +104,7 @@ pub struct GeneralConsensusConfig {
     pub utxos: Vec<Utxo>,
     pub blend_notes: Vec<ServiceNote>,
     pub wallet_accounts: Vec<WalletAccount>,
+    pub funding_sk: ZkKey,
 }
 
 #[derive(Clone)]
@@ -205,21 +206,29 @@ pub fn create_consensus_configs(
 ) -> Result<Vec<GeneralConsensusConfig>, ConsensusConfigError> {
     let mut leader_keys = Vec::new();
     let mut blend_notes = Vec::new();
+    let mut sdp_notes = Vec::new();
 
-    let utxos = create_utxos_for_leader_and_services(ids, &mut leader_keys, &mut blend_notes);
+    let utxos = create_utxos_for_leader_and_services(
+        ids,
+        &mut leader_keys,
+        &mut blend_notes,
+        &mut sdp_notes,
+    );
     let utxos = append_wallet_utxos(utxos, wallet);
     let genesis_tx = create_genesis_tx(&utxos)?;
     let ledger_config = build_ledger_config(consensus_params)?;
 
     Ok(leader_keys
         .into_iter()
-        .map(|(pk, sk)| GeneralConsensusConfig {
+        .enumerate()
+        .map(|(i, (pk, sk))| GeneralConsensusConfig {
             leader_config: LeaderConfig { pk, sk },
             ledger_config: ledger_config.clone(),
             genesis_tx: genesis_tx.clone(),
             utxos: utxos.clone(),
             blend_notes: blend_notes.clone(),
             wallet_accounts: wallet.accounts.clone(),
+            funding_sk: sdp_notes[i].sk.clone(),
         })
         .collect())
 }
@@ -228,6 +237,7 @@ fn create_utxos_for_leader_and_services(
     ids: &[[u8; 32]],
     leader_keys: &mut Vec<(ZkPublicKey, UnsecuredZkKey)>,
     blend_notes: &mut Vec<ServiceNote>,
+    sdp_notes: &mut Vec<ServiceNote>,
 ) -> Vec<Utxo> {
     let mut utxos = Vec::new();
 
@@ -238,6 +248,7 @@ fn create_utxos_for_leader_and_services(
     for &id in ids {
         output_index = push_leader_utxo(id, leader_keys, &mut utxos, output_index);
         output_index = push_service_note(b"bn", id, blend_notes, &mut utxos, output_index);
+        output_index = push_service_note(b"sdp", id, sdp_notes, &mut utxos, output_index);
     }
 
     utxos
diff --git a/testing-framework/core/src/nodes/node.rs b/testing-framework/core/src/nodes/node.rs
index 581ff14..383cae7 100644
--- a/testing-framework/core/src/nodes/node.rs
+++ b/testing-framework/core/src/nodes/node.rs
@@ -1,6 +1,6 @@
 use std::{ops::Deref, path::PathBuf, time::Duration};
 
-use nomos_node::Config;
+use nomos_node::config::RunConfig;
 use nomos_tracing_service::LoggerLayer;
 pub use testing_framework_config::nodes::node::create_node_config;
 use tracing::{debug, info};
@@ -31,11 +31,11 @@ fn binary_path() -> PathBuf {
 }
 
 pub struct Node {
-    handle: NodeHandle<Config>,
+    handle: NodeHandle<RunConfig>,
 }
 
 impl Deref for Node {
-    type Target = NodeHandle<Config>;
+    type Target = NodeHandle<RunConfig>;
 
     fn deref(&self) -> &Self::Target {
         &self.handle
@@ -67,7 +67,7 @@ impl Node {
         self.handle.wait_for_exit(timeout).await
     }
 
-    pub async fn spawn(config: Config, label: &str) -> Result<Self, SpawnNodeError> {
+    pub async fn spawn(config: RunConfig, label: &str) -> Result<Self, SpawnNodeError> {
         let log_prefix = format!("{LOGS_PREFIX}-{label}");
         let handle = spawn_node(
             config,
@@ -84,19 +84,19 @@ impl Node {
     }
 }
 
-impl NodeConfigCommon for Config {
+impl NodeConfigCommon for RunConfig {
     fn set_logger(&mut self, logger: LoggerLayer) {
-        self.tracing.logger = logger;
+        self.user.tracing.logger = logger;
     }
 
     fn set_paths(&mut self, base: &std::path::Path) {
-        self.storage.db_path = base.join("db");
+        self.user.storage.db_path = base.join("db");
     }
 
     fn addresses(&self) -> NodeAddresses {
         (
-            self.http.backend_settings.address,
-            Some(self.testing_http.backend_settings.address),
+            self.user.http.backend_settings.address,
+            Some(self.user.testing_http.backend_settings.address),
         )
     }
 }
diff --git a/testing-framework/core/src/topology/deployment.rs b/testing-framework/core/src/topology/deployment.rs
index 7cb2fc2..ef28548 100644
--- a/testing-framework/core/src/topology/deployment.rs
+++ b/testing-framework/core/src/topology/deployment.rs
@@ -107,7 +107,7 @@ impl Topology {
     fn node_listen_ports(&self) -> Vec<u16> {
         self.nodes
             .iter()
-            .map(|node| node.config().network.backend.swarm.port)
+            .map(|node| node.config().user.network.backend.swarm.port)
             .collect()
     }
 
@@ -116,6 +116,7 @@ impl Topology {
             .iter()
             .map(|node| {
                 node.config()
+                    .user
                     .network
                     .backend
                     .initial_peers
@@ -130,7 +131,12 @@ impl Topology {
         self.nodes
             .iter()
             .enumerate()
-            .map(|(idx, node)| format!("node#{idx}@{}", node.config().network.backend.swarm.port))
+            .map(|(idx, node)| {
+                format!(
+                    "node#{idx}@{}",
+                    node.config().user.network.backend.swarm.port
+                )
+            })
             .collect()
     }
 }
diff --git a/testing-framework/deployers/local/src/node_control/mod.rs b/testing-framework/deployers/local/src/node_control/mod.rs
index 7bb0acc..548ee84 100644
--- a/testing-framework/deployers/local/src/node_control/mod.rs
+++ b/testing-framework/deployers/local/src/node_control/mod.rs
@@ -3,7 +3,7 @@ use std::{
     sync::Mutex,
 };
 
-use nomos_node::Config as NodeConfig;
+use nomos_node::config::RunConfig as NodeConfig;
 use testing_framework_config::topology::configs::{consensus, time};
 use testing_framework_core::{
     nodes::{
@@ -167,7 +167,7 @@ impl LocalDynamicNodes {
         let listen_ports = state
             .nodes
             .iter()
-            .map(|node| node.config().network.backend.swarm.port)
+            .map(|node| node.config().user.network.backend.swarm.port)
             .collect::<Vec<_>>();
 
         let initial_peer_ports = state
@@ -175,6 +175,7 @@ impl LocalDynamicNodes {
             .iter()
             .map(|node| {
                 node.config()
+                    .user
                     .network
                     .backend
                     .initial_peers
@@ -191,7 +192,10 @@ impl LocalDynamicNodes {
             .iter()
             .enumerate()
             .map(|(idx, node)| ReadinessNode {
-                label: format!("node#{idx}@{}", node.config().network.backend.swarm.port),
+                label: format!(
+                    "node#{idx}@{}",
+                    node.config().user.network.backend.swarm.port
+                ),
                 expected_peers: expected_peer_counts.get(idx).copied(),
                 api: node.api().clone(),
             })
diff --git a/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs b/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs
index 2fe192c..f6bb93c 100644
--- a/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs
+++ b/testing-framework/tools/cfgsync_tf/src/bin/cfgsync-client.rs
@@ -4,7 +4,7 @@ use cfgsync_tf::{
     client::{FetchedConfig, get_config},
     server::ClientIp,
 };
-use nomos_node::Config as NodeConfig;
+use nomos_node::config::RunConfig as NodeConfig;
 use serde::{Serialize, de::DeserializeOwned};
 use testing_framework_config::constants::cfgsync_port as default_cfgsync_port;
 use testing_framework_core::nodes::common::config::injection::{