diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
index f91166ebacb..ba08c4029e7 100644
--- a/.github/e2e-tests.yml
+++ b/.github/e2e-tests.yml
@@ -1012,8 +1012,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1027,8 +1027,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 # Enable after flaking issue is resolved
 #  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
@@ -1043,8 +1043,8 @@ runner-test-matrix:
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
 #      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1058,8 +1058,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 # Enable after flaking issue is resolved
 #  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
@@ -1074,8 +1074,8 @@ runner-test-matrix:
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
 #      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
@@ -1090,8 +1090,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 
   # END: CCIPv1.6 tests
diff --git a/deployment/environment/devenv/rmn_config.go b/deployment/environment/devenv/rmn_config.go
index 59d5e5d1cdb..623499a6fe8 100644
--- a/deployment/environment/devenv/rmn_config.go
+++ b/deployment/environment/devenv/rmn_config.go
@@ -33,7 +33,7 @@ type SharedConfigNetworking struct {
 type HomeChain struct {
 	Name                 string `toml:"name"`
 	CapabilitiesRegistry string `toml:"capabilities_registry"`
-	CCIPConfig           string `toml:"ccip_config"`
+	CCIPHome             string `toml:"ccip_home"`
 	RMNHome              string `toml:"rmn_home"`
 }
 
diff --git a/integration-tests/testsetups/test_helpers.go b/integration-tests/testsetups/test_helpers.go
index f33dacb3851..57c25e58a46 100644
--- a/integration-tests/testsetups/test_helpers.go
+++ b/integration-tests/testsetups/test_helpers.go
@@ -351,7 +351,7 @@ func GenerateTestRMNConfig(t *testing.T, nRMNNodes int, tenv changeset.DeployedE
 		HomeChain: devenv.HomeChain{
 			Name:                 MustCCIPNameToRMNName(hc.Name),
 			CapabilitiesRegistry: state.Chains[tenv.HomeChainSel].CapabilityRegistry.Address().String(),
-			CCIPConfig:           state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
+			CCIPHome:             state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
 			RMNHome:              state.Chains[tenv.HomeChainSel].RMNHome.Address().String(),
 		},
 		RemoteChains: remoteChains,