diff --git a/ops_boba/api/watcher-api/serverless-bobaavax.yml b/ops_boba/api/watcher-api/serverless-bobaavax.yml
index 9be0cee529..b17dd7e70e 100644
--- a/ops_boba/api/watcher-api/serverless-bobaavax.yml
+++ b/ops_boba/api/watcher-api/serverless-bobaavax.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-bobaavax.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-bobaavax.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-bobaavax.yml):SUBNET_ID_1}
+        - ${file(env-bobaavax.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-bobaavax.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/serverless-bobabeam.yml b/ops_boba/api/watcher-api/serverless-bobabeam.yml
index 11e7ed8ccd..1cccec1374 100644
--- a/ops_boba/api/watcher-api/serverless-bobabeam.yml
+++ b/ops_boba/api/watcher-api/serverless-bobabeam.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-bobabeam.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-bobabeam.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-bobabeam.yml):SUBNET_ID_1}
+        - ${file(env-bobabeam.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-bobabeam.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/serverless-bobabnb.yml b/ops_boba/api/watcher-api/serverless-bobabnb.yml
index 117b569a81..a50beaf4b3 100644
--- a/ops_boba/api/watcher-api/serverless-bobabnb.yml
+++ b/ops_boba/api/watcher-api/serverless-bobabnb.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-bobabnb.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-bobabnb.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-bobabnb.yml):SUBNET_ID_1}
+        - ${file(env-bobabnb.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-bobabnb.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/serverless-bobabnbtestnet.yml b/ops_boba/api/watcher-api/serverless-bobabnbtestnet.yml
index f6c3f91ce7..b27488a429 100644
--- a/ops_boba/api/watcher-api/serverless-bobabnbtestnet.yml
+++ b/ops_boba/api/watcher-api/serverless-bobabnbtestnet.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-boba-bnb-testnet.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-boba-bnb-testnet.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-boba-bnb-testnet.yml):SUBNET_ID_1}
+        - ${file(env-boba-bnb-testnet.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-boba-bnb-testnet.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/serverless-bobafuji.yml b/ops_boba/api/watcher-api/serverless-bobafuji.yml
index c8667a6102..1ed19fea30 100644
--- a/ops_boba/api/watcher-api/serverless-bobafuji.yml
+++ b/ops_boba/api/watcher-api/serverless-bobafuji.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-boba-fuji.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-boba-fuji.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-boba-fuji.yml):SUBNET_ID_1}
+        - ${file(env-boba-fuji.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-boba-fuji.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/serverless-bobaoperatestnet.yml b/ops_boba/api/watcher-api/serverless-bobaoperatestnet.yml
index 0d00f298e5..13e0b55975 100644
--- a/ops_boba/api/watcher-api/serverless-bobaoperatestnet.yml
+++ b/ops_boba/api/watcher-api/serverless-bobaoperatestnet.yml
@@ -116,3 +116,20 @@ functions:
           cors: true
     layers:
       - ${file(env-boba-opera-testnet.yml):LAYERS}
+  watcher_getLayerZeroTransactions:
+    handler: watcher_getLayerZeroTransactions.watcher_getLayerZeroTransactions
+    memorySize: 10240 # optional, in MB, default is 1024
+    timeout: 60 # optional, in seconds, default is 6
+    vpc:
+      securityGroupIds:
+        - ${file(env-boba-opera-testnet.yml):SECURITY_GROUPS}
+      subnetIds:
+        - ${file(env-boba-opera-testnet.yml):SUBNET_ID_1}
+        - ${file(env-boba-opera-testnet.yml):SUBNET_ID_2}
+    events:
+      - http:
+          path: get.layerzero.transactions
+          method: post
+          cors: true
+    layers:
+      - ${file(env-boba-opera-testnet.yml):LAYERS}
diff --git a/ops_boba/api/watcher-api/watcher_getLayerZeroTransactions.py b/ops_boba/api/watcher-api/watcher_getLayerZeroTransactions.py
index a0a8456947..6c5d14904f 100644
--- a/ops_boba/api/watcher-api/watcher_getLayerZeroTransactions.py
+++ b/ops_boba/api/watcher-api/watcher_getLayerZeroTransactions.py
@@ -3,7 +3,7 @@
 import pymysql
 
 
-def watcher_getLayerZeroTransaction(event, context):
+def watcher_getLayerZeroTransactions(event, context):
     # Parse incoming event
     body = json.loads(event["body"])
     address = body.get("address")
diff --git a/packages/boba/gateway/src/components/listToken/listToken.js b/packages/boba/gateway/src/components/listToken/listToken.js
index e56d306261..70717ee9e2 100644
--- a/packages/boba/gateway/src/components/listToken/listToken.js
+++ b/packages/boba/gateway/src/components/listToken/listToken.js
@@ -11,6 +11,8 @@ import { getCoinImage } from 'util/coinImage'
 import * as S from './listToken.styles'
 import { BRIDGE_TYPE } from 'util/constant'
 
+import networkService from 'services/networkService'
+
 function ListToken({
   token,
   chain,
@@ -111,16 +113,16 @@ function ListToken({
                   >
                     Fast Bridge to L2
                 </Button>
-                {token.symbol === 'BOBA' &&
+                {token.symbol === 'BOBA' && !networkService.L1ChainAsset.foundation &&
                   <Button
                     onClick={() => { handleModalClick('depositModal', token, BRIDGE_TYPE.MULTI_CHAIN_BRIDGE) }}
                     color='primary'
                     disabled={disabled}
                     variant="contained"
-                    tooltip="A multi-chain bridge to Alt L1."
+                    tooltip="A multi-chain bridge to Ethereum."
                     fullWidth
                   >
-                    Bridge to alt L1
+                    Bridge to Ethereum
                   </Button>
                 }
               </>
@@ -226,7 +228,7 @@ function ListToken({
               >
                 Fast Bridge to L2
             </Button>
-            {token.symbol === 'BOBA' &&
+            {token.symbol === 'BOBA' && !networkService.L1ChainAsset.foundation &&
 
               <Button
                 onClick={() => { handleModalClick('depositModal', token, BRIDGE_TYPE.MULTI_CHAIN_BRIDGE) }}
@@ -235,7 +237,7 @@ function ListToken({
                 variant="contained"
                 fullWidth
               >
-                Bridge to alt L1
+                Bridge to Ethereum
               </Button>
             }
             </>
diff --git a/packages/boba/gateway/src/containers/history/History.js b/packages/boba/gateway/src/containers/history/History.js
index 107d2ab3ee..5c79a73702 100644
--- a/packages/boba/gateway/src/containers/history/History.js
+++ b/packages/boba/gateway/src/containers/history/History.js
@@ -48,6 +48,8 @@ import Tabs from 'components/tabs/Tabs'
 
 import { POLL_INTERVAL } from 'util/constant'
 
+import networkService from 'services/networkService'
+
 function History() {
 
   const theme = useTheme()
@@ -139,7 +141,7 @@ function History() {
           <Tabs
             onClick={tab => {dispatch(setActiveHistoryTab(tab))}}
             activeTab={activeTab}
-            tabs={['All', 'Ethereum to Boba Ethereum L2', 'Boba Ethereum L2 to Ethereum', 'Bridge between L1s', 'Pending']}
+            tabs={['All', `${networkService.L1ChainAsset.name} to ${networkService.L1ChainAsset.l2Name}`, `${networkService.L1ChainAsset.l2Name} to ${networkService.L1ChainAsset.name}`, 'Bridge between L1s', 'Pending']}
           />
 
           {activeTab === 'All' && (
@@ -149,14 +151,14 @@ function History() {
             />
           )}
 
-          {activeTab === 'Ethereum to Boba Ethereum L2' &&
+          {activeTab === `${networkService.L1ChainAsset.name} to ${networkService.L1ChainAsset.l2Name}` &&
             <Deposits
               searchHistory={searchHistory}
               transactions={transactions}
             />
           }
 
-          {activeTab === 'Boba Ethereum L2 to Ethereum' &&
+          {activeTab === `${networkService.L1ChainAsset.l2Name} to ${networkService.L1ChainAsset.name}` &&
             <Exits
               searchHistory={searchHistory}
               transactions={transactions}
diff --git a/packages/boba/gateway/src/containers/history/TX_Deposits.js b/packages/boba/gateway/src/containers/history/TX_Deposits.js
index ec398d7885..a3b2fa89f7 100644
--- a/packages/boba/gateway/src/containers/history/TX_Deposits.js
+++ b/packages/boba/gateway/src/containers/history/TX_Deposits.js
@@ -28,6 +28,8 @@ import Transaction from 'components/transaction/Transaction'
 
 import * as S from './History.styles';
 
+import networkService from 'services/networkService'
+
 const PER_PAGE = 10
 
 function TX_Deposits({ searchHistory, transactions }) {
@@ -125,7 +127,7 @@ function TX_Deposits({ searchHistory, transactions }) {
                     title={`Hash: ${i.hash}`}
                     time={moment.unix(i.timeStamp).format('lll')}
                     blockNumber={`Block ${i.blockNumber}`}
-                    chain={`Ethereum to Boba Ethereum L2 ${i.activity === 'ClientDepositL1Batch' ? 'in Batch' : ''}`}
+                    chain={`${networkService.L1ChainAsset.name} to ${networkService.L1ChainAsset.l2Name} ${i.activity === 'ClientDepositL1Batch' ? 'in Batch' : ''}`}
                     typeTX={`TX Type: ${metaData}`}
                     detail={details}
                     oriChain={chain}
diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js
index d7c28e67f6..bcb290a6ee 100644
--- a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js
+++ b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStep.js
@@ -20,6 +20,8 @@ import { WrapperActionsModal } from 'components/modal/Modal.styles'
 import BN from 'bignumber.js'
 import { ethers } from 'ethers'
 
+import networkService from 'services/networkService'
+
 function InputStep({ handleClose, token, isBridge, openTokenPicker }) {
 
   const dispatch = useDispatch()
@@ -67,7 +69,7 @@ function InputStep({ handleClose, token, isBridge, openTokenPicker }) {
       )
     }
     if (res) {
-      dispatch(setActiveHistoryTab('Ethereum to Boba Ethereum L2'))
+      dispatch(setActiveHistoryTab(`${networkService.L1ChainAsset.Name} to ${networkService.L1ChainAsset.l2name}`))
       handleClose()
     }
 
diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js
index 2416d49b25..8dac383d9f 100644
--- a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js
+++ b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepBatch.js
@@ -101,7 +101,7 @@ function InputStepBatch({ isBridge, handleClose }) {
     )
 
     if (res) {
-      dispatch(setActiveHistoryTab('Boba Ethereum L2 to Ethereum'))
+      dispatch(setActiveHistoryTab(`${networkService.L1ChainAsset.l2Name} to ${networkService.L1ChainAsset.name}`))
       dispatch(
         openAlert(
           `Your funds were bridged to the L1LP in batch.`
diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js
index 36caec7ee2..afa3e7e4fe 100644
--- a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js
+++ b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepFast.js
@@ -159,7 +159,7 @@ function InputStepFast({ handleClose, token, isBridge, openTokenPicker }) {
       res = await dispatch(depositL1LP(token.address, value_Wei_String))
 
       if (res) {
-        dispatch(setActiveHistoryTab('Ethereum to Boba Ethereum L2'))
+        dispatch(setActiveHistoryTab(`${networkService.L1ChainAsset.Name} to ${networkService.L1ChainAsset.l2name}`))
         dispatch(
           openAlert(
             `${networkService.L1NativeTokenSymbol} was bridged. You will receive approximately
@@ -195,7 +195,7 @@ function InputStepFast({ handleClose, token, isBridge, openTokenPicker }) {
     )
 
     if (res) {
-      dispatch(setActiveHistoryTab('Ethereum to Boba Ethereum L2'))
+      dispatch(setActiveHistoryTab(`${networkService.L1ChainAsset.Name} to ${networkService.L1ChainAsset.l2name}`))
       dispatch(
         openAlert(
           `${token.symbol} was bridged to the L1LP. You will receive approximately
diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js
index 457df10f73..0aa51f1d0c 100644
--- a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js
+++ b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js
@@ -22,9 +22,10 @@ import { useTheme } from '@emotion/react'
 import { WrapperActionsModal } from 'components/modal/Modal.styles'
 
 import BN from 'bignumber.js'
-import Select from 'components/select/Select'
-import { selectAltL1DepositCost } from 'selectors/balanceSelector'
-import { fetchAltL1DepositFee } from 'actions/balanceAction'
+import parse from 'html-react-parser'
+
+import { selectAltL1DepositCost, selectL1FeeBalance } from 'selectors/balanceSelector'
+import { fetchAltL1DepositFee, fetchL1FeeBalance } from 'actions/balanceAction'
 
 import networkService from 'services/networkService'
 
@@ -50,7 +51,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
   const dispatch = useDispatch()
 
   const [ value, setValue ] = useState('')
-  const [ altL1Bridge, setAltL1Bridge ] = useState('')
+  const [ altL1Bridge, setAltL1Bridge ] = useState(networkService.L1ChainAsset.l1NameShort)
 
   const [ validValue, setValidValue ] = useState(false)
   const depositLoading = useSelector(selectLoading([ 'DEPOSIT_ALTL1/CREATE' ]))
@@ -58,6 +59,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
   const signatureStatus = useSelector(selectSignatureStatus_depositTRAD)
   const lookupPrice = useSelector(selectLookupPrice)
   const depositFees = useSelector(selectAltL1DepositCost)
+  const feeBalance = useSelector(selectL1FeeBalance) //amount of ETH on L1 to pay gas
 
   const maxValue = logAmount(token.balance, token.decimals)
 
@@ -96,6 +98,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
   const isMobile = useMediaQuery(theme.breakpoints.down('md'))
 
   useEffect(() => {
+    dispatch(fetchL1FeeBalance()) //ETH balance for paying gas
     dispatch(fetchAltL1DepositFee())
   },[dispatch])
 
@@ -139,25 +142,24 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
       </Box>)
   }
 
-  const onBridgeChange = (e) => {
-    setAltL1Bridge(e.target.value)
-  }
+  let ETHstring = ''
+  let warning = false
 
-  const customStyles = {
-    option: (provided, state) => ({
-      ...provided,
-      color: state.isSelected ? '#282828' : '#909090',
-    }),
+  if (depositFees[altL1Bridge]) {
+    if(Number(depositFees[altL1Bridge].fee) > Number(feeBalance)) {
+      warning = true
+      ETHstring = `WARNING: your L1 ${networkService.L1NativeTokenSymbol} balance of ${Number(feeBalance).toFixed(4)} is not sufficient to cover this transaction.`
+    }
   }
 
   return (
     <>
       <Box>
         <Typography variant="h2" sx={{ fontWeight: 700, mb: 3 }}>
-          Bridge {token && token.symbol ? token.symbol : ''} to Alt L1s
+          Bridge {token && token.symbol ? token.symbol : ''} to Ethereum
         </Typography>
 
-        <Box display="flex" fullWidth py={2} flexDirection="column"
+        {/* <Box display="flex" fullWidth py={2} flexDirection="column"
         >
           <Select
             options={options}
@@ -167,10 +169,10 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
             sx={{ marginBottom: '20px' }}
             value={altL1Bridge}
           />
-        </Box>
+        </Box> */}
 
         <Input
-          label="Amount to bridge to alt L1s"
+          label="Amount to bridge to Ethereum"
           placeholder="0.0"
           value={value}
           type="number"
@@ -194,7 +196,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
 
         {!!altL1Bridge && depositFees? <>
           <Typography variant='body2' sx={{ mt: 2 }}>
-            Estimated fee for bridging {value} {token.symbol} is {depositFees[altL1Bridge].fee} ETH
+            Estimated fee for bridging {value} {token.symbol} is {depositFees[altL1Bridge].fee} {networkService.L1NativeTokenSymbol}
           </Typography>
         </> : null}
 
@@ -204,6 +206,12 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
           </Typography>
         )}
 
+        {warning && (
+          <Typography variant="body2" sx={{mt: 2, color: 'red'}}>
+            {parse(ETHstring)}
+          </Typography>
+        )}
+
       </Box>
       <WrapperActionsModal>
         <Button
@@ -222,7 +230,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker })
           variant="contained"
           loading={depositLoading}
           tooltip={depositLoading ? "Your transaction is still pending. Please wait for confirmation." : "Click here to bridge your funds to alt L1"}
-          disabled={!validValue || !altL1Bridge}
+          disabled={!validValue || !altL1Bridge || warning}
           triggerTime={new Date()}
           fullWidth={isMobile}
         >
diff --git a/packages/boba/gateway/src/services/networkService.js b/packages/boba/gateway/src/services/networkService.js
index 5d26536e7d..747c5e591c 100644
--- a/packages/boba/gateway/src/services/networkService.js
+++ b/packages/boba/gateway/src/services/networkService.js
@@ -72,10 +72,10 @@ import veJson from "../deployment/contracts/ve.json"
 // import dispatcherJson from "../deployment/contracts/BaseV1Dispatcher.json"
 
 // multi chain alt l1s ABI's
-// import AltL1BridgeJson from "../deployment/contracts/crosschain/AltL1Bridge.json"
-import ETHL1BridgeJson from "../deployment/contracts/crosschain/EthBridge.json"
-import L2StandardERC20Json from "../deployment/contracts/crosschain/L2StandardERC20.json"
-import LZEndpointMockJson from "../deployment/contracts/crosschain/LZEndpointMock.json"
+import AltL1BridgeJson from "@boba/contracts/artifacts/contracts/lzTokenBridge/AltL1Bridge.sol/AltL1Bridge.json"
+import ETHL1BridgeJson from "@boba/contracts/artifacts/contracts/lzTokenBridge/EthBridge.sol/EthBridge.json"
+import L2StandardERC20Json from "@eth-optimism/contracts/artifacts/contracts/standards/L2StandardERC20.sol/L2StandardERC20.json"
+import LZEndpointMockJson from "@boba/contracts/artifacts/contracts/test-helpers/mocks/LZEndpointMock.sol/LZEndpointMock.json"
 
 import { getNftImageUrl } from 'util/nftImage'
 import { getNetwork } from 'util/masterConfig'
@@ -122,9 +122,9 @@ const L2MessengerAddress = '0x4200000000000000000000000000000000000007'
 const L2StandardBridgeAddress = '0x4200000000000000000000000000000000000010'
 const L2GasOracle = '0x420000000000000000000000000000000000000F'
 const L2_SecondaryFeeToken_Address = '0x4200000000000000000000000000000000000023'
-let supportedAltL1Chains = []
 
 let allAddresses = {}
+
 // preload allAddresses
 if (process.env.REACT_APP_CHAIN === 'bobaBase') {
   allAddresses = {
@@ -132,15 +132,16 @@ if (process.env.REACT_APP_CHAIN === 'bobaBase') {
     L1LPAddress: addresses_BobaBase.Proxy__L1LiquidityPool,
     L2LPAddress: addresses_BobaBase.Proxy__L2LiquidityPool
   }
-  supportedAltL1Chains = ['Moonbeam']
 }
 if (process.env.REACT_APP_CHAIN === 'bobaBeam') {
   allAddresses = {
     ...addresses_BobaBeam,
     L1LPAddress: addresses_BobaBeam.Proxy__L1LiquidityPool,
-    L2LPAddress: addresses_BobaBeam.Proxy__L2LiquidityPool
+    L2LPAddress: addresses_BobaBeam.Proxy__L2LiquidityPool,
+    ...layerZeroMainnet.BOBA_Bridges.Mainnet,
+    ...layerZeroMainnet.Layer_Zero_Protocol.Moonbeam,
+    layerZeroTargetChainID: layerZeroMainnet.Layer_Zero_Protocol.Mainnet.Layer_Zero_ChainId,
   }
-  supportedAltL1Chains = ['Moonbeam']
 }
 if (process.env.REACT_APP_CHAIN === 'bobaOperaTestnet') {
   allAddresses = {
@@ -160,7 +161,10 @@ if (process.env.REACT_APP_CHAIN === 'bobaAvax') {
   allAddresses = {
     ...addresses_BobaAvax,
     L1LPAddress: addresses_BobaAvax.Proxy__L1LiquidityPool,
-    L2LPAddress: addresses_BobaAvax.Proxy__L2LiquidityPool
+    L2LPAddress: addresses_BobaAvax.Proxy__L2LiquidityPool,
+    ...layerZeroMainnet.BOBA_Bridges.Mainnet,
+    ...layerZeroMainnet.Layer_Zero_Protocol.Avalanche,
+    layerZeroTargetChainID: layerZeroMainnet.Layer_Zero_Protocol.Mainnet.Layer_Zero_ChainId,
   }
 }
 if (process.env.REACT_APP_CHAIN === 'bobaBnbTestnet') {
@@ -174,7 +178,10 @@ if (process.env.REACT_APP_CHAIN === 'bobaBnb') {
   allAddresses = {
     ...addresses_BobaBnb,
     L1LPAddress: addresses_BobaBnb.Proxy__L1LiquidityPool,
-    L2LPAddress: addresses_BobaBnb.Proxy__L2LiquidityPool
+    L2LPAddress: addresses_BobaBnb.Proxy__L2LiquidityPool,
+    ...layerZeroMainnet.BOBA_Bridges.Mainnet,
+    ...layerZeroMainnet.Layer_Zero_Protocol.BNB,
+    layerZeroTargetChainID: layerZeroMainnet.Layer_Zero_Protocol.Mainnet.Layer_Zero_ChainId,
   }
 }
 
@@ -185,6 +192,7 @@ const supportedMultiChains = ['bobaBase', 'bobaOperaTestnet', 'bobaFuji', 'bobaB
 const L1ChainAssets = {
   'bobaBase': {
     name: 'Moonbase',
+    l1NameShort: 'Moonbase',
     l2Name: 'Bobabase',
     icon: (bool) => <MoonbaseIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL],
@@ -192,6 +200,7 @@ const L1ChainAssets = {
   },
   'bobaBeam': {
     name: 'Moonbeam',
+    l1NameShort: 'Moonbeam',
     l2Name: 'Bobabeam',
     icon: (bool) => <MoonbeamIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL],
@@ -200,6 +209,7 @@ const L1ChainAssets = {
   },
   'bobaOperaTestnet': {
     name: 'Fantom Testenet',
+    l1NameShort: 'Fantom',
     l2Name: 'Bobaopera Testnet',
     icon: (bool) => <FantomIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL],
@@ -208,6 +218,7 @@ const L1ChainAssets = {
   },
   'bobaFuji': {
     name: 'Avalanche Testnet',
+    l1NameShort: 'Avalanche',
     l2Name: 'Boba Avalanche Testnet',
     icon: (bool) => <AvaxIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL],
@@ -216,6 +227,7 @@ const L1ChainAssets = {
   },
   'bobaAvax': {
     name: 'Avalanche Mainnet C-Chain',
+    l1NameShort: 'Avalanche',
     l2Name: 'Boba Avalanche Mainnet',
     icon: (bool) => <AvaxIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL, 'EVO', 'USDT.e', 'USDt', 'USDC.e', 'BUSD.e', 'BUSD', 'DAI.e'],
@@ -226,6 +238,7 @@ const L1ChainAssets = {
   },
   'bobaBnbTestnet': {
     name: 'BNB Testnet',
+    l1NameShort: 'BNB',
     l2Name: 'Boba BNB Testnet',
     icon: (bool) => <BnbIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL],
@@ -234,6 +247,7 @@ const L1ChainAssets = {
   },
   'bobaBnb': {
     name: 'Binance Smart Chain Mainnet',
+    l1NameShort: 'BNB',
     l2Name: 'Boba BNB Mainnet',
     icon: (bool) => <BnbIcon selected={bool}/>,
     supportedTokens: [ 'BOBA', process.env.REACT_APP_L1_NATIVE_TOKEN_SYMBOL, 'BUSD', 'USDC', "USDT"],
@@ -342,7 +356,7 @@ class NetworkService {
 
     this.L1ChainAsset = L1ChainAssets[this.chain]
     // support alt l1 tokens
-    this.supportedAltL1Chains = supportedAltL1Chains
+    this.supportedAltL1Chains = [L1ChainAssets[this.chain].l1NameShort]
   }
 
   bindProviderListeners() {
@@ -4072,12 +4086,12 @@ class NetworkService {
       return
     }
     try {
-      const pResponse = supportedAltL1Chains.map(async (type) => {
+      const pResponse = this.supportedAltL1Chains.map(async (type) => {
         let L0_ETH_ENDPOINT = allAddresses.Layer_Zero_Endpoint;
-        let ETH_L1_BOBA_ADDRESS = allAddresses.TK_L1BOBA;
-        let L0_CHAIN_ID = allAddresses.Layer_Zero_ChainId;
-        let ALT_L1_BOBA_ADDRESS = allAddresses[`Proxy__EthBridgeTo${type}`];
-        let PROXY_ETH_L1_BRIDGE_ADDRESS_TO = allAddresses[`${type}_TK_BOBA`];
+        let ETH_L1_BOBA_ADDRESS = allAddresses[`${type}_TK_BOBA`];
+        let L0_TARGET_CHAIN_ID = allAddresses.layerZeroTargetChainID;
+        let ALT_L1_BOBA_ADDRESS = allAddresses.Eth_TK_BOBA;
+        let PROXY_ETH_L1_BRIDGE_ADDRESS_TO = allAddresses[`Proxy__${type}BridgeToEth`];
 
         // Layer zero doesn't support moonbase
         // return 0 for those bridges that haven't been implemented yet
@@ -4087,7 +4101,7 @@ class NetworkService {
 
         const Proxy__EthBridge = new ethers.Contract(
           PROXY_ETH_L1_BRIDGE_ADDRESS_TO,
-          ETHL1BridgeJson.abi,
+          AltL1BridgeJson.abi,
           this.provider.getSigner()
         );
 
@@ -4111,7 +4125,7 @@ class NetworkService {
 
         console.log(`🆙 loading 💵 FEE for ${type}`);
         const estimatedFee = await ETHLayzerZeroEndpoint.estimateFees(
-          L0_CHAIN_ID,
+          L0_TARGET_CHAIN_ID,
           Proxy__EthBridge.address,
           payload,
           false,
@@ -4147,13 +4161,14 @@ class NetworkService {
     }
     try {
       let L0_ETH_ENDPOINT = allAddresses.Layer_Zero_Endpoint;
-      let ETH_L1_BOBA_ADDRESS = allAddresses.TK_L1BOBA;
-      let PROXY_ETH_L1_BRIDGE_ADDRESS_TO = allAddresses[`Proxy__EthBridgeTo${type}`];
-      let ALT_L1_BOBA_ADDRESS = allAddresses[`${type}_TK_BOBA`];
+      let L0_TARGET_CHAIN_ID = allAddresses.layerZeroTargetChainID;
+      let ETH_L1_BOBA_ADDRESS = allAddresses[`${type}_TK_BOBA`];
+      let ALT_L1_BOBA_ADDRESS = allAddresses.Eth_TK_BOBA;
+      let PROXY_ETH_L1_BRIDGE_ADDRESS_TO = allAddresses[`Proxy__${type}BridgeToEth`];
       /* proxy eth bridge contract */
       const Proxy__EthBridge = new ethers.Contract(
         PROXY_ETH_L1_BRIDGE_ADDRESS_TO,
-        ETHL1BridgeJson.abi,
+        AltL1BridgeJson.abi,
         this.provider.getSigner()
       );
 
@@ -4197,7 +4212,7 @@ class NetworkService {
       );
 
       let estimatedFee = await ETHLayzerZeroEndpoint.estimateFees(
-        allAddresses.Layer_Zero_ChainId,
+        L0_TARGET_CHAIN_ID,
         Proxy__EthBridge.address,
         payload,
         false,
@@ -4206,9 +4221,8 @@ class NetworkService {
 
       console.log(`🆙 Depositing ${value} 👉 ${type} l1 with 💵 FEE ${ethers.utils.formatEther(estimatedFee._nativeFee)}`);
 
-      await Proxy__EthBridge.depositERC20(
+      await Proxy__EthBridge.withdraw(
         ETH_L1_BOBA_ADDRESS,
-        ALT_L1_BOBA_ADDRESS,
         ethers.utils.parseEther(value),
         ethers.constants.AddressZero,
         "0x", // adapterParams
diff --git a/packages/boba/register/addresses/layerZeroMainnet.json b/packages/boba/register/addresses/layerZeroMainnet.json
index 25447a6e92..4d37610845 100644
--- a/packages/boba/register/addresses/layerZeroMainnet.json
+++ b/packages/boba/register/addresses/layerZeroMainnet.json
@@ -39,6 +39,7 @@
       "FantomBridgeToEth": "0x2164dFc94E0f2EE6C2982045950ed052298D12a0",
       "AvalancheBridgeToEth": "0xBFcB8A6eD80Ef99a5265B72fdC87f4B4dAA598D3",
       "MoonbeamBridgeToEth": "0x05469d879dF44cD83f6923Be12f46E2871dA2DAf",
+      "Eth_TK_BOBA": "0x42bbfa2e77757c645eeaad1655e0911a7553efbc",
       "BNB_TK_BOBA": "0xE0DB679377A0F5Ae2BaE485DE475c9e1d8A4607D",
       "Avalanche_TK_BOBA": "0x3cD790449CF7D187a143d4Bd7F4654d4f2403e02",
       "Fantom_TK_BOBA": "0x4389b230D15119c347B9E8BEA6d930A21aaDF6BA",