diff --git a/go.mod b/go.mod
index 9a319d42..72be0c13 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ replace (
 
 require (
 	github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869
-	github.com/decentrio/rollup-e2e-testing v0.0.0-20240906122105-34ede6dfe1d1
+	github.com/decentrio/rollup-e2e-testing v0.0.0-20240910042137-4b80501642c9
 	github.com/dymensionxyz/dymension/v3 v3.1.0-rc03.0.20240717194206-54c0fca5fada
 	github.com/dymensionxyz/dymint v1.2.0-rc01
 )
diff --git a/go.sum b/go.sum
index ce1f2522..37c1b10f 100644
--- a/go.sum
+++ b/go.sum
@@ -770,8 +770,8 @@ github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR
 github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
 github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869 h1:qWpUYGOsrSC+1Vmd2TjhbsSpntvvx9PsX3AoeMunFxc=
 github.com/decentrio/e2e-testing-live v0.0.0-20240718080249-ee255229c869/go.mod h1:HZNYnPwmSxkwTPjSD5yolauc1Vx1ZzKL4FFMxTq4H5Y=
-github.com/decentrio/rollup-e2e-testing v0.0.0-20240906122105-34ede6dfe1d1 h1:VP1JKYWYR3XkFYaqgnJ/A79X1y2A1aqkoqqvFB654/0=
-github.com/decentrio/rollup-e2e-testing v0.0.0-20240906122105-34ede6dfe1d1/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c=
+github.com/decentrio/rollup-e2e-testing v0.0.0-20240910042137-4b80501642c9 h1:yxIfbIDKRqM1VF9U27ImOue7MRb/OFmB7nitX2iKssQ=
+github.com/decentrio/rollup-e2e-testing v0.0.0-20240910042137-4b80501642c9/go.mod h1:QmBrZgZplhtgHRWC0Z7LC7TDsKuC8sDyQvZyXXaqw/c=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI=
diff --git a/tests/admc_test.go b/tests/admc_test.go
index 574d838f..7d96f3e4 100644
--- a/tests/admc_test.go
+++ b/tests/admc_test.go
@@ -35,6 +35,7 @@ func TestADMC_Originates_HubtoRA_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -201,6 +202,7 @@ func TestADMC_Migrate_Empty_User_Memo_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -423,6 +425,7 @@ func TestADMC_Migrate_With_User_Memo_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -653,6 +656,7 @@ func TestADMC_Originates_HubtoRA_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -819,6 +823,7 @@ func TestADMC_Migrate_Empty_User_Memo_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1038,6 +1043,7 @@ func TestADMC_Migrate_With_User_Memo_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1264,6 +1270,7 @@ func TestADMC_MetaData_NotFound_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1460,6 +1467,7 @@ func TestADMC_MetaData_NotFound_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/automated_denommetadata_test.go b/tests/automated_denommetadata_test.go
index 53fcbf75..8266c1a8 100644
--- a/tests/automated_denommetadata_test.go
+++ b/tests/automated_denommetadata_test.go
@@ -1276,6 +1276,7 @@ func TestADMC_Hub_to_RA_Migrate_Dym_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1467,6 +1468,7 @@ func TestADMC_Hub_to_RA_Migrate_Dym_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/disconnection_test.go b/tests/disconnection_test.go
index c01aacb2..ef1e5d4d 100644
--- a/tests/disconnection_test.go
+++ b/tests/disconnection_test.go
@@ -122,6 +122,7 @@ func TestDisconnection_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
 	dymintTomlOverrides["max_supported_batch_skew"] = "1"
 	dymintTomlOverrides["batch_acceptance_attempts"] = "1"
@@ -248,6 +249,7 @@ func TestDisconnection_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_batch_max_size_bytes"] = "1000"
 	dymintTomlOverrides["max_supported_batch_skew"] = "1"
 	dymintTomlOverrides["batch_acceptance_attempts"] = "1"
diff --git a/tests/eibc_corrupted_memo_test.go b/tests/eibc_corrupted_memo_test.go
index 01bf2324..250345fa 100644
--- a/tests/eibc_corrupted_memo_test.go
+++ b/tests/eibc_corrupted_memo_test.go
@@ -38,6 +38,7 @@ func TestEIBCCorruptedMemoNegative_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/eibc_fee_test.go b/tests/eibc_fee_test.go
index 513c0f84..b8500af5 100644
--- a/tests/eibc_fee_test.go
+++ b/tests/eibc_fee_test.go
@@ -38,6 +38,7 @@ func TestEIBCFeeTooHigh_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 	dymintTomlOverrides["block_time"] = "2s"
 
diff --git a/tests/eibc_feemarket_test.go b/tests/eibc_feemarket_test.go
index cde27d43..11031911 100644
--- a/tests/eibc_feemarket_test.go
+++ b/tests/eibc_feemarket_test.go
@@ -1249,6 +1249,7 @@ func TestEIBCUpdateOnAckErrAndTimeout_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1769,6 +1770,7 @@ func TestEIBCUpdateOnTimeout_Unallowed_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/eibc_nobalance_test.go b/tests/eibc_nobalance_test.go
index 80405a14..9414a90d 100644
--- a/tests/eibc_nobalance_test.go
+++ b/tests/eibc_nobalance_test.go
@@ -39,6 +39,7 @@ func TestEIBCNoBalanceToFulfillOrder_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/eibc_timeout_test.go b/tests/eibc_timeout_test.go
index 8f08683c..5eb34945 100644
--- a/tests/eibc_timeout_test.go
+++ b/tests/eibc_timeout_test.go
@@ -38,6 +38,7 @@ func TestEIBCTimeoutDymToRollapp_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/frozen_test.go b/tests/frozen_test.go
index 84dd9756..84e16234 100644
--- a/tests/frozen_test.go
+++ b/tests/frozen_test.go
@@ -1186,6 +1186,7 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -1199,6 +1200,7 @@ func TestOtherRollappNotAffected_Wasm(t *testing.T) {
 	dymintTomlOverrides2["max_proof_time"] = "500ms"
 	dymintTomlOverrides2["max_idle_time"] = "3s"
 	dymintTomlOverrides2["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides2["config/dymint.toml"] = dymintTomlOverrides2
diff --git a/tests/fullnode_sync_block_sync_test.go b/tests/fullnode_sync_block_sync_test.go
index fc99f929..3047d212 100644
--- a/tests/fullnode_sync_block_sync_test.go
+++ b/tests/fullnode_sync_block_sync_test.go
@@ -43,6 +43,7 @@ func TestSync_BlockSync_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "3600s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["block_time"] = "20ms"
 	dymintTomlOverrides["p2p_gossip_cache_size"] = "1"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "true"
@@ -180,7 +181,7 @@ func TestSync_BlockSync_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -384,6 +385,7 @@ func TestSync_BlockSync_fn_disconnect_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "3600s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["block_time"] = "20ms"
 	dymintTomlOverrides["p2p_gossip_cache_size"] = "1"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "true"
@@ -521,7 +523,7 @@ func TestSync_BlockSync_fn_disconnect_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}),
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}),
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
diff --git a/tests/fullnode_sync_gossip_test.go b/tests/fullnode_sync_gossip_test.go
index 201004f0..7e0aa48f 100644
--- a/tests/fullnode_sync_gossip_test.go
+++ b/tests/fullnode_sync_gossip_test.go
@@ -42,6 +42,7 @@ func TestSync_Celes_Rt_Gossip_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -175,7 +176,7 @@ func TestSync_Celes_Rt_Gossip_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -357,6 +358,7 @@ func TestSync_Celes_Rt_Gossip_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "80s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -492,7 +494,7 @@ func TestSync_Celes_Rt_Gossip_Wasm(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -634,6 +636,7 @@ func TestSync_Sqc_Disconnect_Gossip_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -767,7 +770,7 @@ func TestSync_Sqc_Disconnect_Gossip_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -982,6 +985,7 @@ func TestSync_Sqc_Disconnect_Gossip_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -1115,7 +1119,7 @@ func TestSync_Sqc_Disconnect_Gossip_Wasm(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -1330,6 +1334,7 @@ func TestSync_Fullnode_Disconnect_Gossip_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -1463,7 +1468,7 @@ func TestSync_Fullnode_Disconnect_Gossip_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -1675,6 +1680,7 @@ func TestSync_Fullnode_Disconnect_Gossip_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "200ms"
 	dymintTomlOverrides["max_proof_time"] = "150ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "5s"
+	dymintTomlOverrides["batch_submit_time"] = "5s"
 	dymintTomlOverrides["block_time"] = "190ms"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
@@ -1808,7 +1814,7 @@ func TestSync_Fullnode_Disconnect_Gossip_Wasm(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
diff --git a/tests/fullnode_sync_test.go b/tests/fullnode_sync_test.go
index dae83a81..5c0a893f 100644
--- a/tests/fullnode_sync_test.go
+++ b/tests/fullnode_sync_test.go
@@ -15,6 +15,7 @@ import (
 	"go.uber.org/zap/zaptest"
 
 	test "github.com/decentrio/rollup-e2e-testing"
+	"github.com/decentrio/rollup-e2e-testing/cosmos"
 	"github.com/decentrio/rollup-e2e-testing/cosmos/hub/celes_hub"
 	"github.com/decentrio/rollup-e2e-testing/cosmos/hub/dym_hub"
 	"github.com/decentrio/rollup-e2e-testing/cosmos/rollapp/dym_rollapp"
@@ -318,6 +319,7 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "80s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides1 := make(map[string]any)
@@ -329,6 +331,14 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 
 	configFileOverrides1["config/config.toml"] = configTomlOverrides1
 
+	modifyEVMGenesisKV := append(
+		rollappEVMGenesisKV,
+		cosmos.GenesisKV{
+			Key:   "app_state.rollappparams.params.da",
+			Value: "celestia",
+		},
+	)
+
 	// Create chain factory with dymension
 	numHubVals := 1
 	numHubFullNodes := 1
@@ -337,7 +347,7 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 	numRollAppVals := 1
 	nodeStore := "/home/celestia/light"
 	p2pNetwork := "mocha-4"
-	coreIp := "rpc-mocha.pops.one"
+	coreIp := "mocha-4-consensus.mesa.newmetric.xyz"
 	// trustedHash := "\"A62DD37EDF3DFF5A7383C6B5AA2AC619D1F8C8FEB7BA07730E50BBAAC8F2FF0C\""
 	// sampleFrom := 2395649
 
@@ -400,19 +410,18 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 	}, nil, "", nil)
 	// require.NoError(t, err)
 
-	// validator, err := celestia.Validators[0].AccountKeyBech32(ctx, "validator")
-	// require.NoError(t, err)
+	validator, err := celestia.Validators[0].AccountKeyBech32(ctx, "validator")
+	require.NoError(t, err)
 
 	// Get fund for submit blob
-	// GetFaucet("http://18.184.170.181:3000/api/get-tia", validator)
-	// err = testutil.WaitForBlocks(ctx, 10, celestia)
-	// require.NoError(t, err)
+	GetFaucet("http://18.184.170.181:3000/api/get-tia", validator)
+
+	time.Sleep(30 * time.Second)
 
 	err = celestia.GetNode().InitCelestiaDaLightNode(ctx, nodeStore, p2pNetwork, nil)
 	require.NoError(t, err)
 
-	err = testutil.WaitForBlocks(ctx, 3, celestia)
-	require.NoError(t, err)
+	time.Sleep(30 * time.Second)
 
 	file, err := os.Open("/tmp/celestia/light/config.toml")
 	require.NoError(t, err)
@@ -456,7 +465,7 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -475,8 +484,7 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 		panic(err)
 	}
 
-	err = testutil.WaitForBlocks(ctx, 10, celestia)
-	require.NoError(t, err)
+	time.Sleep(30 * time.Second)
 
 	celestia_token, err := celestia.GetNode().GetAuthTokenCelestiaDaLight(ctx, p2pNetwork, nodeStore)
 	require.NoError(t, err)
@@ -509,7 +517,7 @@ func TestFullnodeSync_Celestia_EVM(t *testing.T) {
 				TrustingPeriod:      "112h",
 				EncodingConfig:      encodingConfig(),
 				NoHostMount:         false,
-				ModifyGenesis:       modifyRollappEVMGenesis(rollappEVMGenesisKV),
+				ModifyGenesis:       modifyRollappEVMGenesis(modifyEVMGenesisKV),
 				ConfigFileOverrides: configFileOverrides,
 			},
 			NumValidators: &numRollAppVals,
@@ -588,6 +596,7 @@ func TestFullnodeSync_Celestia_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "80s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides1 := make(map[string]any)
@@ -726,7 +735,7 @@ func TestFullnodeSync_Celestia_Wasm(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
diff --git a/tests/genesis_transfer_test.go b/tests/genesis_transfer_test.go
index 32b183b9..7eb9e200 100644
--- a/tests/genesis_transfer_test.go
+++ b/tests/genesis_transfer_test.go
@@ -35,6 +35,7 @@ func TestGenesisTransferBridgeBlocking_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -185,6 +186,7 @@ func TestGenesisTransferBridgeBlocking_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -335,6 +337,7 @@ func TestGenesisTransferConnectionBlock_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -494,6 +497,7 @@ func TestGenesisTransferConnectionBlock_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/ibc_pfm_test.go b/tests/ibc_pfm_test.go
index a0d81891..2de4ea28 100644
--- a/tests/ibc_pfm_test.go
+++ b/tests/ibc_pfm_test.go
@@ -37,6 +37,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 // 	// Create chain factory with dymension
@@ -287,6 +288,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 // 	// Create chain factory with dymension
@@ -537,6 +539,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 // 	// Create chain factory with dymension
@@ -783,6 +786,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 // 	// Create chain factory with dymension
diff --git a/tests/ibc_pfm_with_grace_period_test.go b/tests/ibc_pfm_with_grace_period_test.go
index 1616b409..1786baa8 100644
--- a/tests/ibc_pfm_with_grace_period_test.go
+++ b/tests/ibc_pfm_with_grace_period_test.go
@@ -38,6 +38,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	modifyGenesisKV := append(
 // 		dymensionGenesisKV,
@@ -333,6 +334,7 @@ package tests
 // 	dymintTomlOverrides["max_idle_time"] = "3s"
 // 	dymintTomlOverrides["max_proof_time"] = "500ms"
 // 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+// dymintTomlOverrides["batch_submit_time"] = "20s"
 
 // 	modifyGenesisKV := append(dymensionGenesisKV,
 // 		cosmos.GenesisKV{
diff --git a/tests/ibc_timeout_test.go b/tests/ibc_timeout_test.go
index a0402482..8f554a86 100644
--- a/tests/ibc_timeout_test.go
+++ b/tests/ibc_timeout_test.go
@@ -38,6 +38,7 @@ func TestIBCTransferTimeout_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "30s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -287,6 +288,7 @@ func TestIBCTransferTimeout_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "30s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/ibc_transfer_test.go b/tests/ibc_transfer_test.go
index 3e988680..0d5ce22a 100644
--- a/tests/ibc_transfer_test.go
+++ b/tests/ibc_transfer_test.go
@@ -34,6 +34,7 @@ func TestSpinUp(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -119,6 +120,7 @@ func TestIBCTransferSuccess_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -293,6 +295,7 @@ func TestIBCTransferSuccess_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -464,6 +467,7 @@ func TestGenesisIBCTransferReservedMemo_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
@@ -621,6 +625,7 @@ func TestGenesisIBCTransferReservedMemo_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 	// Create chain factory with dymension
diff --git a/tests/rollapp_upgrade_test.go b/tests/rollapp_upgrade_test.go
index 233d1e0e..16ed23e6 100644
--- a/tests/rollapp_upgrade_test.go
+++ b/tests/rollapp_upgrade_test.go
@@ -36,6 +36,7 @@ func TestRollappUpgradeNonStateBreaking_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -243,6 +244,7 @@ func TestRollappUpgradeNonStateBreaking_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -453,6 +455,7 @@ func TestRollapp_EVM_Upgrade(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
@@ -706,6 +709,7 @@ func TestRollapp_Wasm_Upgrade(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
diff --git a/tests/sequencer_test.go b/tests/sequencer_test.go
index 47585163..1f65e5db 100644
--- a/tests/sequencer_test.go
+++ b/tests/sequencer_test.go
@@ -42,6 +42,7 @@ func TestSequencerCelestia_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "80s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides1 := make(map[string]any)
@@ -179,7 +180,7 @@ func TestSequencerCelestia_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
@@ -320,6 +321,7 @@ func TestSequencerHubDisconnection_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "30s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	configFileOverrides1 := make(map[string]any)
@@ -458,7 +460,7 @@ func TestSequencerHubDisconnection_EVM(t *testing.T) {
 
 	// Create an exec instance
 	execConfig := types.ExecConfig{
-		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.accname", "validator"}), // Replace with your command and arguments
+		Cmd: strslice.StrSlice([]string{"celestia", "light", "start", "--node.store", nodeStore, "--gateway", "--core.ip", coreIp, "--p2p.network", p2pNetwork, "--keyring.keyname", "validator"}), // Replace with your command and arguments
 	}
 
 	execIDResp, err := client.ContainerExecCreate(ctx, containerID, execConfig)
diff --git a/tests/setup.go b/tests/setup.go
index 1f9f64e4..95bedddf 100644
--- a/tests/setup.go
+++ b/tests/setup.go
@@ -108,7 +108,7 @@ var (
 
 	DymensionMainRepo = "ghcr.io/dymensionxyz/dymension"
 
-	RollappEVMMainRepo = "ghcr.io/decentrio/rollapp-evm"
+	RollappEVMMainRepo = "ghcr.io/dymensionxyz/rollapp-evm"
 
 	RollappWasmMainRepo = "ghcr.io/dymensionxyz/rollapp-wasm"
 
@@ -128,9 +128,8 @@ var (
 
 	rollappEVMImage = ibc.DockerImage{
 		Repository: RollappEVMMainRepo,
-		// Version:    rollappEVMVersion,
-		Version: "ra-consensus-param",
-		UidGid:  "1025:1025",
+		Version:    rollappEVMVersion,
+		UidGid:     "1025:1025",
 	}
 
 	rollappWasmImage = ibc.DockerImage{
@@ -198,11 +197,11 @@ var (
 	rollappEVMGenesisKV = []cosmos.GenesisKV{
 		{
 			Key:   "app_state.sequencers.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		{
 			Key:   "app_state.staking.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		{
 			Key:   "app_state.mint.params.mint_denom",
@@ -269,20 +268,16 @@ var (
 				},
 			},
 		},
-		{
-			Key:   "app_state.rollappparams.params.da",
-			Value: "celestia",
-		},
 	}
 
 	rollappWasmGenesisKV = []cosmos.GenesisKV{
 		{
 			Key:   "app_state.sequencers.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		{
 			Key:   "app_state.staking.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		// Bank denom metadata
 		{
@@ -314,11 +309,11 @@ var (
 	dymensionGenesisKV = []cosmos.GenesisKV{
 		{
 			Key:   "app_state.sequencer.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		{
 			Key:   "app_state.staking.params.unbonding_time",
-			Value: "180s",
+			Value: "300s",
 		},
 		// gov params
 		{
@@ -673,6 +668,7 @@ func overridesDymintToml(settlemenLayer, nodeAddress, rollappId, gasPrices, maxI
 	dymintTomlOverrides["max_proof_time"] = maxProofTime
 	dymintTomlOverrides["batch_submit_max_time"] = batchSubmitMaxTime
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 
 	configFileOverrides["config/dymint.toml"] = dymintTomlOverrides
 
diff --git a/tests/tx_batch_finalization_test.go b/tests/tx_batch_finalization_test.go
index cb7355ae..291bc40b 100644
--- a/tests/tx_batch_finalization_test.go
+++ b/tests/tx_batch_finalization_test.go
@@ -43,6 +43,7 @@ func TestBatchFinalization_EVM(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	modifyGenesisKV := append(
@@ -182,6 +183,7 @@ func TestBatchFinalization_Wasm(t *testing.T) {
 	dymintTomlOverrides["max_idle_time"] = "3s"
 	dymintTomlOverrides["max_proof_time"] = "500ms"
 	dymintTomlOverrides["batch_submit_max_time"] = "100s"
+	dymintTomlOverrides["batch_submit_time"] = "20s"
 	dymintTomlOverrides["p2p_blocksync_enabled"] = "false"
 
 	modifyGenesisKV := append(