diff --git a/config/executor_addresses.json b/config/executor_addresses.json
index 3f644c0..4ca205f 100644
--- a/config/executor_addresses.json
+++ b/config/executor_addresses.json
@@ -1,14 +1,15 @@
 {
   "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"
+    "uniswap_v2": "0xEA8b7BC64dc58E4c702CDEcA439033bcdEd8D61f",
+    "sushiswap_v2": "0xF0E698751051daC13f20A49D3752275dDA02BA3A",
+    "pancakeswap_v2": "0x13bbDa1c372f314E92f729a16a58a6210aAB6596",
+    "uniswap_v3": "0xc5A53382B3caA24A81E07a3508063a06C05B65C3",
+    "pancakeswap_v3": "0x1C1d33f86dD7D8f2E729fde0b24B340FedC1D6a9",
+    "uniswap_v4": "0x7708505465bb9a1074f04e947f3903b840693fb6",
+    "vm:balancer_v2": "0xb89ef3EFAd54968A4A51E7fF77E397C735d1EA97",
+    "ekubo_v2": "0x25197ecCFB672ea78744997BfeFb3d181a9c6Ed3",
+    "vm:curve": "0x9bbD00a793Ea8Af721c37aAB189330754e7CdfE8",
+    "vm:maverick_v2": "0x7C413D61BdaF253E3FeE8a1C99EeA6A5Cb9FCf66"
   },
   "tenderly_ethereum": {
     "uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
diff --git a/config/router_addresses.json b/config/router_addresses.json
index 95ba8e0..601b5d8 100644
--- a/config/router_addresses.json
+++ b/config/router_addresses.json
@@ -1,5 +1,5 @@
 {
-  "ethereum": "0xabA2fC41e2dB95E77C6799D0F580034395FF2B9E",
+  "ethereum": "0x5ae23a14B87be5e08c86F6c61a25EE9B7Cc49F3B",
   "base": "0xC2C23b0199525DE070D126860133dc3badaD2EEb",
   "unichain": "0x9BDC3bE75440dBE563527CB39BB11cFBD1E21b09"
 }
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 b18fdd4..6b4fa07 100644
--- a/foundry/scripts/deploy-executors.js
+++ b/foundry/scripts/deploy-executors.js
@@ -68,7 +68,14 @@ const executors_to_deploy = {
                 "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
                 "0x000000000022D473030F116dDEE9F6B43aC78BA3"
             ]
-        }
+        },
+        // Args: factory, permit2
+        {
+            exchange: "MaverickV2Executor", args: [
+                "0x0A7e848Aca42d879EF06507Fca0E7b33A0a63c1e",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            ]
+        },
     ],
     "base": [
          // Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
@@ -114,9 +121,15 @@ const executors_to_deploy = {
                  "0x000000000022D473030F116dDEE9F6B43aC78BA3"
             ]
         },
-        // Args: Pool manager
-        {exchange: "UniswapV4Executor", args: ["0x498581ff718922c3f8e6a244956af099b2652b2b"]},
-        {exchange: "BalancerV2Executor", args: []},
+        // Args: Pool manager, Permit2
+        {
+            exchange: "UniswapV4Executor", args: [
+                "0x498581ff718922c3f8e6a244956af099b2652b2b",
+                "0x000000000022D473030F116dDEE9F6B43aC78BA3"
+            ]
+        },
+        // Args: Permit2
+        {exchange: "BalancerV2Executor", args: ["0x000000000022D473030F116dDEE9F6B43aC78BA3"]},
     ],
     "unichain": [
         // Args: Factory, Pool Init Code Hash, Permit2, Fee BPS
@@ -137,10 +150,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..7a37348 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"
     ],
@@ -33,7 +31,6 @@
     "EXECUTOR_SETTER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
@@ -48,7 +45,6 @@
     "EXECUTOR_SETTER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0xb0A77f867Fcec1e9b271Ee17354bC6bBC0dD5662"
     ],
@@ -63,7 +59,6 @@
     "EXECUTOR_SETTER_ROLE": [
       "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
     ],
-    "FEE_SETTER_ROLE": [],
     "PAUSER_ROLE": [
       "0x810A00Fa9287700871ba0f870Cd89D7Eac08D48C"
     ],