diff --git a/build/devenv/env-geth.toml b/build/devenv/env-geth.toml
index 0e4015a5..dc8b4069 100644
--- a/build/devenv/env-geth.toml
+++ b/build/devenv/env-geth.toml
@@ -8,4 +8,10 @@
   container_name = "blockchain-dst"
   chain_id = "2337"
   port = "8555"
-  type = "geth"
\ No newline at end of file
+  type = "geth"
+
+[[blockchains]]
+  container_name = "blockchain-3rd"
+  chain_id = "3337"
+  port = "8565"
+  type = "geth"
diff --git a/build/devenv/environment.go b/build/devenv/environment.go
index a945fe73..085c07bc 100644
--- a/build/devenv/environment.go
+++ b/build/devenv/environment.go
@@ -84,7 +84,7 @@ func checkKeys(in *Cfg) error {
 
 func NewProductConfigurationFromNetwork(typ string) (CCIP17ProductConfiguration, error) {
 	switch typ {
-	case "anvil":
+	case "anvil", "geth":
 		return &ccvEvm.CCIP17EVM{}, nil
 	case "canton":
 		// see devenv-evm implementation and add Canton
diff --git a/common/pkg/multi_node_client.go b/common/pkg/multi_node_client.go
index 08fc2e7f..17ecce8a 100644
--- a/common/pkg/multi_node_client.go
+++ b/common/pkg/multi_node_client.go
@@ -27,14 +27,14 @@ func CreateMultiNodeClientFromInfo(ctx context.Context, blockchainInfo *protocol
 	noNewHeadsThreshold := 3 * time.Minute
 	selectionMode := ptr("HighestHead")
 	leaseDuration := 0 * time.Second
-	pollFailureThreshold := ptr(uint32(5))
+	pollFailureThreshold := ptr(uint32(10))
 	pollInterval := 2 * time.Second
-	syncThreshold := ptr(uint32(5))
+	syncThreshold := ptr(uint32(10))
 	nodeIsSyncingEnabled := ptr(false)
 	chainTypeStr := blockchainInfo.Type
-	finalizedBlockOffset := ptr[uint32](16)
+	finalizedBlockOffset := ptr[uint32](1)
 	enforceRepeatableRead := ptr(true)
-	deathDeclarationDelay := time.Second * 3
+	deathDeclarationDelay := time.Minute * 3
 	noNewFinalizedBlocksThreshold := time.Second * 120
 	finalizedBlockPollInterval := time.Second * 10
 	newHeadsPollInterval := time.Second * 4