diff --git a/auth/auth-server/src/server/api_handlers/connectors/rfqt/helpers.rs b/auth/auth-server/src/server/api_handlers/connectors/rfqt/helpers.rs
index 95f78655..77de4138 100644
--- a/auth/auth-server/src/server/api_handlers/connectors/rfqt/helpers.rs
+++ b/auth/auth-server/src/server/api_handlers/connectors/rfqt/helpers.rs
@@ -88,6 +88,8 @@ fn chain_to_chain_id(chain: Chain) -> u64 {
         Chain::ArbitrumSepolia => 421614,
         Chain::BaseMainnet => 8453,
         Chain::BaseSepolia => 84532,
+        Chain::EthereumMainnet => 1,
+        Chain::EthereumSepolia => 11155111,
         Chain::Devnet => 0,
     }
 }
diff --git a/funds-manager/funds-manager-server/src/cli.rs b/funds-manager/funds-manager-server/src/cli.rs
index 81aa1059..97d7c948 100644
--- a/funds-manager/funds-manager-server/src/cli.rs
+++ b/funds-manager/funds-manager-server/src/cli.rs
@@ -256,6 +256,7 @@ pub struct ChainConfig {
 
 impl ChainConfig {
     /// Build chain-specific clients from the given config
+    #[allow(clippy::too_many_arguments)]
     pub async fn build_clients(
         &self,
         chain: Chain,
@@ -298,9 +299,9 @@ impl ChainConfig {
             self.max_gas_refill_amount.unwrap_or(cli_args.max_gas_refill_amount);
         let max_gas_withdrawal_amount =
             self.max_gas_withdrawal_amount.unwrap_or(cli_args.max_gas_withdrawal_amount);
-        let gas_top_up_amount = self.gas_top_up_amount.unwrap_or_else(|| DEFAULT_TOP_UP_AMOUNT);
+        let gas_top_up_amount = self.gas_top_up_amount.unwrap_or(DEFAULT_TOP_UP_AMOUNT);
         let gas_refill_tolerance =
-            self.gas_refill_tolerance.unwrap_or_else(|| DEFAULT_GAS_REFILL_TOLERANCE);
+            self.gas_refill_tolerance.unwrap_or(DEFAULT_GAS_REFILL_TOLERANCE);
 
         let custody_client = CustodyClient::new(
             chain,
diff --git a/funds-manager/funds-manager-server/src/custody_client/hot_wallets.rs b/funds-manager/funds-manager-server/src/custody_client/hot_wallets.rs
index b8f87a7b..8aeee871 100644
--- a/funds-manager/funds-manager-server/src/custody_client/hot_wallets.rs
+++ b/funds-manager/funds-manager-server/src/custody_client/hot_wallets.rs
@@ -171,6 +171,12 @@ impl CustodyClient {
     pub(crate) async fn top_up_quoter_hot_wallet_gas(&self) -> Result<(), FundsManagerError> {
         let hot_wallet = self.get_quoter_hot_wallet().await?;
         let desc = format!("quoter top-up amount {DEFAULT_QUOTER_GAS_TOP_UP_AMOUNT}");
-        self.top_up_gas(&hot_wallet.address, ETHEREUM_MAINNET_ETH_ASSET_ID, DEFAULT_QUOTER_GAS_TOP_UP_AMOUNT, &desc).await
+        self.top_up_gas(
+            &hot_wallet.address,
+            ETHEREUM_MAINNET_ETH_ASSET_ID,
+            DEFAULT_QUOTER_GAS_TOP_UP_AMOUNT,
+            &desc,
+        )
+        .await
     }
 }
diff --git a/funds-manager/funds-manager-server/src/execution_client/venues/bebop/mod.rs b/funds-manager/funds-manager-server/src/execution_client/venues/bebop/mod.rs
index e634f374..85ca6ab8 100644
--- a/funds-manager/funds-manager-server/src/execution_client/venues/bebop/mod.rs
+++ b/funds-manager/funds-manager-server/src/execution_client/venues/bebop/mod.rs
@@ -345,6 +345,7 @@ fn to_bebop_chain(chain: Chain) -> Result<String, ExecutionClientError> {
     match chain {
         Chain::ArbitrumOne => Ok("arbitrum".to_string()),
         Chain::BaseMainnet => Ok("base".to_string()),
+        Chain::EthereumMainnet => Ok("ethereum".to_string()),
         _ => Err(ExecutionClientError::onchain(format!("Bebop does not support chain: {chain}"))),
     }
 }
diff --git a/funds-manager/funds-manager-server/src/execution_client/venues/cowswap/mod.rs b/funds-manager/funds-manager-server/src/execution_client/venues/cowswap/mod.rs
index b02048d4..37ce324d 100644
--- a/funds-manager/funds-manager-server/src/execution_client/venues/cowswap/mod.rs
+++ b/funds-manager/funds-manager-server/src/execution_client/venues/cowswap/mod.rs
@@ -479,6 +479,7 @@ fn to_cowswap_chain(chain: Chain) -> Result<String, ExecutionClientError> {
     match chain {
         Chain::ArbitrumOne => Ok("arbitrum_one".to_string()),
         Chain::BaseMainnet => Ok("base".to_string()),
+        Chain::EthereumMainnet => Ok("mainnet".to_string()),
         _ => Err(ExecutionClientError::onchain(format!("Cowswap does not support chain: {chain}"))),
     }
 }
diff --git a/renegade-deploy-config.toml b/renegade-deploy-config.toml
index 676be969..d946d98c 100644
--- a/renegade-deploy-config.toml
+++ b/renegade-deploy-config.toml
@@ -53,6 +53,26 @@ cargo_features = "ethereum"
 environment = "ethereum-sepolia"
 resource = "auth-server-v2"
 
+[services.ethereum-sepolia-auth-server]
+[services.ethereum-sepolia-auth-server.build]
+dockerfile = "auth/Dockerfile"
+ecr_repo = "auth-server-ethereum-sepolia-v2"
+cargo_features = "ethereum"
+
+[services.ethereum-sepolia-auth-server.deploy]
+environment = "ethereum-sepolia"
+resource = "auth-server-v2"
+
+[services.ethereum-mainnet-auth-server]
+[services.ethereum-mainnet-auth-server.build]
+dockerfile = "auth/Dockerfile"
+ecr_repo = "auth-server-ethereum-mainnet-v2"
+cargo_features = "ethereum"
+
+[services.ethereum-mainnet-auth-server.deploy]
+environment = "ethereum-mainnet"
+resource = "auth-server-v2"
+
 #####################
 ### Funds Manager ###
 #####################