diff --git a/config/executor_addresses.json b/config/executor_addresses.json
index 1c0bd97..53b0161 100644
--- a/config/executor_addresses.json
+++ b/config/executor_addresses.json
@@ -1,9 +1,9 @@
 {
   "ethereum": {
-    "uniswap_v2": "0xE6424D3d95A5D86e2b6cB3E1d77B9391816265DD",
-    "uniswap_v3": "0xdba8d9142e98ebd30608e65d685f01826b2ae6a4",
-    "uniswap_v4": "0xE183caC244f44D1922BDcE041e960Db3979860BB",
-    "vm:balancer_v2": "0xF99eE7695db4f5fc181A3EE3bC7333E8a0312335"
+    "uniswap_v2": "0xf6c5be66FFf9DC69962d73da0A617a827c382329",
+    "uniswap_v3": "0xdD8559c917393FC8DD2b4dD289c52Ff445fDE1B0",
+    "uniswap_v4": "0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70",
+    "vm:balancer_v2": "0x00BE8EfAE40219Ff76287b0F9b9e497942f5BC91"
   },
   "tenderly_ethereum": {
     "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
diff --git a/foundry/scripts/deploy-executors.js b/foundry/scripts/deploy-executors.js
index c57db44..e04acef 100644
--- a/foundry/scripts/deploy-executors.js
+++ b/foundry/scripts/deploy-executors.js
@@ -5,9 +5,9 @@ const hre = require("hardhat");
 // Comment out the executors you don't want to deploy
 const executors_to_deploy = [
     {exchange: "UniswapV2Executor", args: []},
-    // {exchange: "UniswapV3Executor", args: ["0x1F98431c8aD98523631AE4a59f267346ea31F984"]},
-    // {exchange: "UniswapV4Executor", args: ["0x000000000004444c5dc75cB358380D2e3dE08A90"]},
-    // {exchange: "BalancerV2Executor", args: []},
+    {exchange: "UniswapV3Executor", args: ["0x1F98431c8aD98523631AE4a59f267346ea31F984"]},
+    {exchange: "UniswapV4Executor", args: ["0x000000000004444c5dc75cB358380D2e3dE08A90"]},
+    {exchange: "BalancerV2Executor", args: []},
 ]
 
 async function main() {
diff --git a/src/encoding/evm/strategy_encoder/strategy_encoders.rs b/src/encoding/evm/strategy_encoder/strategy_encoders.rs
index 33d100d..704316b 100644
--- a/src/encoding/evm/strategy_encoder/strategy_encoders.rs
+++ b/src/encoding/evm/strategy_encoder/strategy_encoders.rs
@@ -400,7 +400,7 @@ mod tests {
         let hex_protocol_data = encode(&protocol_data);
         assert_eq!(
             executor_address,
-            Bytes::from_str("0xE6424D3d95A5D86e2b6cB3E1d77B9391816265DD").unwrap()
+            Bytes::from_str("0xf6c5be66FFf9DC69962d73da0A617a827c382329").unwrap()
         );
         assert_eq!(
             hex_protocol_data,
@@ -525,7 +525,7 @@ mod tests {
         let hex_protocol_data = encode(&protocol_data);
         assert_eq!(
             executor_address,
-            Bytes::from_str("0xE183caC244f44D1922BDcE041e960Db3979860BB").unwrap()
+            Bytes::from_str("0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70").unwrap()
         );
         assert_eq!(
             hex_protocol_data,
@@ -537,7 +537,7 @@ mod tests {
                 // zero for one
                 "00",
                 // executor address
-                "e183cac244f44d1922bdce041e960db3979860bb",
+                "042c0ebbeab9d9987c2f64ee05f2b3aeb86eaf70",
                 // first pool intermediary token (ETH)
                 "0000000000000000000000000000000000000000",
                 // fee
@@ -669,7 +669,7 @@ mod tests {
             "01",     // token out index
             "000000", // split
             // Swap data
-            "e6424d3d95a5d86e2b6cb3e1d77b9391816265dd", // executor address
+            "f6c5be66fff9dc69962d73da0a617a827c382329", // executor address
             "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in
             "a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id
             "3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver
@@ -990,12 +990,12 @@ mod tests {
             "01",     // token out index
             "000000", // split
             // Swap data header
-            "e183cac244f44d1922bdce041e960db3979860bb", // executor address
+            "042c0ebbeab9d9987c2f64ee05f2b3aeb86eaf70", // executor address
             // Protocol data
             "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // group token in
             "6982508145454ce325ddbe47a25d4ec3d2311933", // group token in
             "00",                                       // zero2one
-            "e183cac244f44d1922bdce041e960db3979860bb", // executor address
+            "042c0ebbeab9d9987c2f64ee05f2b3aeb86eaf70", // executor address
             // First pool params
             "0000000000000000000000000000000000000000", // intermediary token (ETH)
             "000bb8",                                   // fee
@@ -1076,7 +1076,7 @@ mod tests {
             "01", // token out index
             "000000", // split
             // Swap data
-            "e6424d3d95a5d86e2b6cb3e1d77b9391816265dd", // executor address
+            "f6c5be66fff9dc69962d73da0a617a827c382329", // executor address
             "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in
             "a478c2975ab1ea89e8196811f51a7b7ade33eb11", // component id
             "3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver