diff --git a/crates/bitvm2-ga/src/challenger/api.rs b/crates/bitvm2-ga/src/challenger/api.rs
index 82d85911..30287c60 100644
--- a/crates/bitvm2-ga/src/challenger/api.rs
+++ b/crates/bitvm2-ga/src/challenger/api.rs
@@ -259,17 +259,20 @@ pub fn build_challenge_incomplete_kickoff_tx(
 
 pub fn nack_timelock(network: Network) -> u32 {
     num_blocks_per_network(network, ACK_TIMELOCK) // actual delay on bitcoin network
-        + if network == Network::Testnet || network == Network::Testnet4 { 18 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet { 18 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet4 { 40 } else { 0 } // Testnet4 extra delay
         + if network == Network::Regtest { 4 } else { 0 } // Regtest extra delay
 }
 
 pub fn commit_blockhash_timeout_timelock(network: Network) -> u32 {
     num_blocks_per_network(network, CONNECTOR_G_TIMELOCK)
-        + if network == Network::Testnet || network == Network::Testnet4 { 18 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet { 18 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet4 { 40 } else { 0 } // Testnet4 extra delay
         + if network == Network::Regtest { 4 } else { 0 } // Regtest extra delay
 }
 
 pub fn assert_commit_timeout_timelock(network: Network) -> u32 {
     num_blocks_per_network(network, ASSERT_COMMIT_TIMELOCK)
+        + if network == Network::Testnet4 { 40 } else { 0 } // Testnet4 extra delay
         + if network == Network::Regtest { 6 } else { 0 } // Regtest extra delay
 }
diff --git a/crates/bitvm2-ga/src/operator/api.rs b/crates/bitvm2-ga/src/operator/api.rs
index f8406f90..c9c53f70 100644
--- a/crates/bitvm2-ga/src/operator/api.rs
+++ b/crates/bitvm2-ga/src/operator/api.rs
@@ -961,16 +961,19 @@ pub fn take1_timelock(network: Network) -> u32 {
 pub fn take2_timelocks(network: Network) -> (u32, u32) {
     (
         num_blocks_per_network(network, CONNECTOR_F_TIMELOCK)
-            + if network == Network::Testnet || network == Network::Testnet4 { 24 } else { 0 } // Testnet extra delay
+            + if network == Network::Testnet { 24 } else { 0 } // Testnet extra delay
+            + if network == Network::Testnet4 { 48 } else { 0 } // Testnet4 extra delay
             + if network == Network::Regtest { 6 } else { 0 }, // Regtest extra delay
         num_blocks_per_network(network, CONNECTOR_D_TIMELOCK)
-            + if network == Network::Testnet || network == Network::Testnet4 { 6 } else { 0 } // Testnet extra delay
+            + if network == Network::Testnet { 6 } else { 0 } // Testnet extra delay
+            + if network == Network::Testnet4 { 60 } else { 0 } // Testnet4 extra delay
             + if network == Network::Regtest { 6 } else { 0 }, // Regtest extra delay
     )
 }
 
 pub fn watchtower_challenge_timeout_timelock(network: Network) -> u32 {
     num_blocks_per_network(network, WATCHTOWER_CHALLENGE_TIMELOCK)
-        + if network == Network::Testnet || network == Network::Testnet4 { 12 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet { 12 } else { 0 } // Testnet extra delay
+        + if network == Network::Testnet4 { 20 } else { 0 } // Testnet4 extra delay
         + if network == Network::Regtest { 2 } else { 0 } // Regtest extra delay
 }
diff --git a/crates/util/src/lib.rs b/crates/util/src/lib.rs
index d4bd2ad2..08b9f04e 100644
--- a/crates/util/src/lib.rs
+++ b/crates/util/src/lib.rs
@@ -14,7 +14,7 @@ pub fn get_btc_block_confirms(network: Network) -> u32 {
     match network {
         Network::Bitcoin => 6,
         Network::Testnet => 10,
-        Network::Testnet4 => 6,
+        Network::Testnet4 => 10,
         Network::Signet => 6,
         Network::Regtest => 1,
     }
diff --git a/node/src/action.rs b/node/src/action.rs
index 52f5da18..add3baae 100644
--- a/node/src/action.rs
+++ b/node/src/action.rs
@@ -4000,7 +4000,6 @@ pub async fn recv_and_dispatch(
             let message_content = GOATMessageContent::ResponseNodeInfo(get_local_node_info());
             send_to_peer(swarm, GOATMessage::from_typed(Actor::All, &message_content)?)?;
         }
-
         (GOATMessageContent::ResponseNodeInfo(node_info), _) => {
             save_node_info(local_db, &node_info).await?;
         }
diff --git a/node/src/utils.rs b/node/src/utils.rs
index cb29fa29..f945534c 100644
--- a/node/src/utils.rs
+++ b/node/src/utils.rs
@@ -1646,7 +1646,7 @@ pub async fn get_disprove_scripts(graph_params: &Bitvm2GraphParameters) -> Resul
 pub async fn get_fee_rate(client: &BTCClient) -> Result<f64> {
     match client.network() {
         //TODO mempool api /fee-estimates failed, fix it latter
-        Network::Testnet | Network::Testnet4 | Network::Regtest => Ok(2.0),
+        Network::Testnet | Network::Testnet4 | Network::Regtest => Ok(5.0),
         _ => {
             let res = client.get_fee_estimates().await?;
             Ok(*res.get(&DEFAULT_CONFIRMATION_TARGET).ok_or(anyhow!(