diff --git a/config/defaults.go b/config/defaults.go
index 3ccc45bc4..d29d2b8d0 100644
--- a/config/defaults.go
+++ b/config/defaults.go
@@ -29,8 +29,8 @@ func DefaultConfig(home, chainId string) *NodeConfig {
 		Aggregator: true,
 		BlockManagerConfig: BlockManagerConfig{
 			BlockTime:              200 * time.Millisecond,
-			EmptyBlocksMaxTime:     60 * time.Second,
-			BatchSubmitMaxTime:     600 * time.Second,
+			EmptyBlocksMaxTime:     3 * time.Second,
+			BatchSubmitMaxTime:     30 * time.Second,
 			NamespaceID:            "000000000000ffff",
 			BlockBatchSize:         500,
 			BlockBatchMaxSizeBytes: 1500000},