diff --git a/config/executor_addresses.json b/config/executor_addresses.json
index 3f644c0..fd174f1 100644
--- a/config/executor_addresses.json
+++ b/config/executor_addresses.json
@@ -1,34 +1,24 @@
 {
   "ethereum": {
-    "uniswap_v2": "0xf6c5be66FFf9DC69962d73da0A617a827c382329",
-    "sushiswap_v2": "0x8ABd4075cF54E0A9C52D18e6951b969AF3249cF9",
-    "pancakeswap_v2": "0x08B0C001D323da1DC8D2465119BAcCb82c3741f8",
-    "uniswap_v3": "0xdD8559c917393FC8DD2b4dD289c52Ff445fDE1B0",
-    "pancakeswap_v3": "0x4929B619A8F0D9c06ed0FfD497636580D823F65d",
-    "uniswap_v4": "0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70",
-    "vm:balancer_v2": "0x2380a9ff20565191b67cd66914cf5151434d71f5",
-    "ekubo_v2": "0x4f88f6630a33dB05BEa1FeF7Dc7ff7508D1c531D",
-    "vm:curve": "0x2751999a30A0026c909c4f1EB92d123254CABa7F"
-  },
-  "tenderly_ethereum": {
-    "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
-    "uniswap_v3": "0x5C2F5a71f67c01775180ADc06909288B4C329308",
-    "uniswap_v4": "0xF62849F9A0B5Bf2913b396098F7c7019b51A820a",
-    "vm:balancer_v2": "0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"
+    "uniswap_v2": "0xaE04CA7E9Ed79cBD988f6c536CE11C621166f41B",
+    "sushiswap_v2": "0x2017ad7035D781C14699C8E44ed62d3083723A18",
+    "pancakeswap_v2": "0xC9db3FEB380E4fd9af239e2595ECdEcE3b5c34A4",
+    "uniswap_v3": "0xbab7124C9662B15C6b9AF0b1f329907dD55a24FC",
+    "pancakeswap_v3": "0x9D32e9F569B22Ae8d8C6f788037C1CD53632A059",
+    "uniswap_v4": "0xD11496EAb53A9521f0bC1e5c1098Ecb467103Ad9",
+    "vm:balancer_v2": "0xB5b8dc3F0a1Be99685a0DEd015Af93bFBB55C411",
+    "ekubo_v2": "0xcCF8e1E39e9ddfa88282fA6a7B31eBFB41a1ED7B",
+    "vm:curve": "0x879F3008D96EBea0fc584aD684c7Df31777F3165",
+    "vm:maverick_v2": "0xF35e3F5F205769B41508A18787b62A21bC80200B"
   },
   "base": {
-    "uniswap_v2": "0x852389F3Cde47e7dab5a29Fdd3E58c7050f1a019",
-    "sushiswap_v2": "0xbAf4569234712233Ae2142A07Bf164f988bDf5B5",
-    "pancakeswap_v2": "0xA669d7b9249B9405bbDc2Ca7A18e6449C472e456",
-    "uniswap_v3": "0x447135F701A4650e4Bd19c2B2B99cb324f8942c3",
-    "uniswap_v4": "0xc34689d354B42b2780Fbe0A785080d761E5C882b"
-  },
-  "tenderly_base": {
-    "uniswap_v3": "0x7c7E06d7317e620a185078e236879D2a87fC8d22"
+    "uniswap_v2": "0xF744EBfaA580cF3fFc25aD046E92BD8B770a0700",
+    "uniswap_v3": "0x647bffbf8bd72bf6341ecba8b0279e090313a40d",
+    "uniswap_v4": "0xb5628b97f491f85766673ac4d5d47bb1af7fcc4a"
   },
   "unichain": {
-    "uniswap_v2": "0x2E80FBD880379744b46C2aB7249D2949E6696353",
-    "uniswap_v3": "0x7ba9149EaCC5801279FF8B4d7ECa020bbef18F90",
-    "uniswap_v4": "0x475EB503D630C2919DC8B24cB6603E17e69Bfe35"
+    "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
+    "uniswap_v3": "0xD26A838A41af3d4815DfD745a080B2062c4124d1",
+    "uniswap_v4": "0xF744EBfaA580cF3fFc25aD046E92BD8B770a0700"
   }
 }
diff --git a/config/router_addresses.json b/config/router_addresses.json
index 95ba8e0..2291d19 100644
--- a/config/router_addresses.json
+++ b/config/router_addresses.json
@@ -1,5 +1,5 @@
 {
-  "ethereum": "0xabA2fC41e2dB95E77C6799D0F580034395FF2B9E",
-  "base": "0xC2C23b0199525DE070D126860133dc3badaD2EEb",
-  "unichain": "0x9BDC3bE75440dBE563527CB39BB11cFBD1E21b09"
+  "ethereum": "0xfD0b31d2E955fA55e3fa641Fe90e08b677188d35",
+  "base": "0xea3207778e39EB02D72C9D3c4Eac7E224ac5d369",
+  "unichain": "0xFfA5ec2e444e4285108e4a17b82dA495c178427B"
 }
diff --git a/foundry/scripts/README.md b/foundry/scripts/README.md
index 8836138..302df41 100644
--- a/foundry/scripts/README.md
+++ b/foundry/scripts/README.md
@@ -19,6 +19,9 @@ export PRIVATE_KEY=<private-key>
 
 ## Deploy on Ethereum Mainnet or Base
 
+Make sure to run `unset HISTFILE` in your terminal before setting the private key. This will prevent the private key
+from being stored in the shell history.
+
 1. Set the following environment variables:
 
 ```
@@ -28,9 +31,6 @@ export PRIVATE_KEY=<private-key>
 export BLOCKCHAIN_EXPLORER_API_KEY=<blockchain-explorer-api-key>
 ```
 
-Make sure to run `unset HISTFILE` in your terminal before setting the private key. This will prevent the private key
-from being stored in the shell history.
-
 ## Deploy Tycho Router
 
 For each of the following, you must select one of `tenderly_ethereum`, `tenderly_base`,
diff --git a/foundry/scripts/deploy-executors.js b/foundry/scripts/deploy-executors.js
index f6a6364..82a9be7 100644
--- a/foundry/scripts/deploy-executors.js
+++ b/foundry/scripts/deploy-executors.js
@@ -49,10 +49,12 @@ const executors_to_deploy = {
             ]
         },
         // Args: Pool manager
-        {exchange: "UniswapV4Executor", args: [
+        {
+            exchange: "UniswapV4Executor", args: [
                 "0x000000000004444c5dc75cB358380D2e3dE08A90",
                 "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-                ]},
+            ]
+        },
         // Args: Permit2
         {exchange: "BalancerV2Executor", args: ["0x000000000022D473030F116dDEE9F6B43aC78BA3"]},
         // Args: Ekubo core contract, Permit2
@@ -68,27 +70,25 @@ const executors_to_deploy = {
                 "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
                 "0x000000000022D473030F116dDEE9F6B43aC78BA3"
             ]
-        }
+        },
+        // Args: factory, permit2
+        {
+            exchange: "MaverickV2Executor", args: [
+                "0x0A7e848Aca42d879EF06507Fca0E7b33A0a63c1e",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            ]
+        },
     ],
     "base": [
-        // // Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
-        // {
-        //     exchange: "UniswapV2Executor", args: [
-        //         "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
-        //         "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f",
-        //          "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        //         30
-        //     ]
-        // },
-        // // SUSHISWAP V2 - Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
-        // {
-        //     exchange: "UniswapV2Executor", args: [
-        //         "0x71524B4f93c58fcbF659783284E38825f0622859",
-        //         "0xe18a34eb0e04b04f7a0ac29a6e80748dca96319b42c54d679cb821dca90c6303",
-        //          "0x000000000022D473030F116dDEE9F6B43aC78BA3",
-        //         30
-        //     ]
-        // },
+        // Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
+        {
+            exchange: "UniswapV2Executor", args: [
+                "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+                "0x96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3",
+                30
+            ]
+        },
         // PANCAKESWAP V2 - Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
         {
             exchange: "UniswapV2Executor", args: [
@@ -98,25 +98,21 @@ const executors_to_deploy = {
                 25
             ]
         },
-        // // USV3 - Args: Factory, Pool Init Code Hash, Permit2
-        // {
-        //     exchange: "UniswapV3Executor", args: [
-        //         "0x33128a8fC17869897dcE68Ed026d694621f6FDfD",
-        //         "0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54",
-        //          "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-        //     ]
-        // },
-        // // PANCAKESWAP V3 - Args: Deployer, Pool Init Code Hash, Permit2
-        // {
-        //     exchange: "UniswapV3Executor", args: [
-        //         "0x41ff9AA7e16B8B1a8a8dc4f0eFacd93D02d071c9",
-        //         "0x6ce8eb472fa82df5469c6ab6d485f17c3ad13c8cd7af59b3d4a8026c5ce0f7e2",
-        //          "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-        //     ]
-        // },
-        // // Args: Pool manager
-        // {exchange: "UniswapV4Executor", args: ["0x498581ff718922c3f8e6a244956af099b2652b2b"]},
-        // {exchange: "BalancerV2Executor", args: []},
+        // USV3 - Args: Factory, Pool Init Code Hash, Permit2
+        {
+            exchange: "UniswapV3Executor", args: [
+                "0x33128a8fC17869897dcE68Ed026d694621f6FDfD",
+                "0xe34f199b19b2b4f47f68442619d555527d244f78a3297ea89325f843f87b8b54",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            ]
+        },
+        // Args: Pool manager, Permit2
+        {
+            exchange: "UniswapV4Executor", args: [
+                "0x498581ff718922c3f8e6a244956af099b2652b2b",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            ]
+        },
     ],
     "unichain": [
         // Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
@@ -137,10 +133,11 @@ const executors_to_deploy = {
             ]
         },
         // Args: Pool manager, Permit2
-        {exchange: "UniswapV4Executor", args: [
+        {
+            exchange: "UniswapV4Executor", args: [
                 "0x1f98400000000000000000000000000000000004",
                 "0x000000000022D473030F116dDEE9F6B43aC78BA3"
-                ]
+            ]
         },
     ],
 }
diff --git a/foundry/scripts/roles.json b/foundry/scripts/roles.json
index 2d477fe..bb441c9 100644
--- a/foundry/scripts/roles.json
+++ b/foundry/scripts/roles.json
@@ -3,7 +3,6 @@
     "EXECUTOR_SETTER_ROLE": [
       "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
@@ -18,7 +17,6 @@
     "EXECUTOR_SETTER_ROLE": [
       "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
@@ -31,24 +29,22 @@
   },
   "base": {
     "EXECUTOR_SETTER_ROLE": [
-      "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
-      "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
     "UNPAUSER_ROLE": [
-      "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
     "FUND_RESCUER_ROLE": [
-      "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ]
   },
   "tenderly_base": {
     "EXECUTOR_SETTER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
@@ -61,17 +57,16 @@
   },
   "unichain": {
     "EXECUTOR_SETTER_ROLE": [
-      "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
-      "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
     "UNPAUSER_ROLE": [
-      "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ],
     "FUND_RESCUER_ROLE": [
-      "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
+      "0x58Dc7Bf9eD1f4890A7505D5bE4E4252978eAF655"
     ]
   }
 }
\ No newline at end of file