diff --git a/boba_community/boba-node/docker-compose.yml b/boba_community/boba-node/docker-compose.yml
index 46351f0e2d..19ad4c90e3 100644
--- a/boba_community/boba-node/docker-compose.yml
+++ b/boba_community/boba-node/docker-compose.yml
@@ -61,8 +61,12 @@ services:
       BLOCK_SIGNER_ADDRESS: "0x00000398232E2064F896018496b4b44b3D62751F"
       ROLLUP_POLL_INTERVAL_FLAG: "10s"
       ROLLUP_ENFORCE_FEES: 'true'
-      TURING_CREDIT_ADDRESS: "0xF8D2f1b0292C0Eeef80D8F47661A9DaCDB4b23bf"
       SEQUENCER_CLIENT_HTTP: https://mainnet.boba.network
+      # turing
+      TURING_CREDIT_ADDRESS: "0xF8D2f1b0292C0Eeef80D8F47661A9DaCDB4b23bf"
+      # fee token
+      L2_BOBA_TOKEN_ADDRESS: "0xa18bF3994C0Cc6E3b63ac420308E5383f53120D7"
+      BOBA_GAS_PRICE_ORACLE_ADDRESS: "0xeE06ee2F239d2ab11792D77f3C347d919ddA0d51"
     logging:
       driver: "json-file"
       options:
diff --git a/boba_community/fraud-detector/docker-compose.yml b/boba_community/fraud-detector/docker-compose.yml
index 859c793d3b..89de25a449 100644
--- a/boba_community/fraud-detector/docker-compose.yml
+++ b/boba_community/fraud-detector/docker-compose.yml
@@ -57,6 +57,9 @@ services:
         ROLLUP_ENFORCE_FEES: 'true'
         # turing credit contract
         TURING_CREDIT_ADDRESS: "0xF8D2f1b0292C0Eeef80D8F47661A9DaCDB4b23bf"
+        # fee token
+        L2_BOBA_TOKEN_ADDRESS: "0xa18bF3994C0Cc6E3b63ac420308E5383f53120D7"
+        BOBA_GAS_PRICE_ORACLE_ADDRESS: "0xeE06ee2F239d2ab11792D77f3C347d919ddA0d51"
     logging:
       driver: "json-file"
       options:
diff --git a/l2geth/params/config.go b/l2geth/params/config.go
index f83ac7676b..c64c29a9c7 100644
--- a/l2geth/params/config.go
+++ b/l2geth/params/config.go
@@ -246,7 +246,7 @@ var (
 	BobaRinkebyGasUpdatedForkNum = big.NewInt(0)
 
 	// BobaMainnetFeeUpdatedForkNum is the height at which the fee update fork activates on Mainnet.
-	BobaMainnetFeeUpdatedForkNum = big.NewInt(550000)
+	BobaMainnetFeeUpdatedForkNum = big.NewInt(485000)
 
 	// BobaRinkebyFeeUpdatedForkNum is the height at which the fee update fork activates on Rinkeby.
 	BobaRinkebyFeeUpdatedForkNum = big.NewInt(50000)
diff --git a/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json b/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
index c7f6b8b1fa..82f7cc84bb 100644
--- a/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
+++ b/packages/boba/register/addresses/addressesMainnet_0x8376ac6C3f73a25Dd994E0b0669ca7ee0C02F089.json
@@ -55,13 +55,14 @@
   "L1CrossDomainMessengerFast": "0x4CD1948de677e6f791B463daaB807645D3460996",
   "OVM_L1CrossDomainMessengerFast": "0x4CD1948de677e6f791B463daaB807645D3460996",
   "Proxy__L1CrossDomainMessengerFast": "0xD05b8fD53614e1569cAC01c6D8d41416d0a7257E",
-  "L2LiquidityPool": "0xfBd2541e316948B259264c02f370eD088E04c3Db",
+  "L2LiquidityPool": "0xe97738dBd11F854E49faEbd5d346034833B4a317",
   "L1LiquidityPool": "0xEcB03B77Fa399676dC20f21e97c8C0F1476f97a0",
   "Proxy__L1LiquidityPool": "0x1A26ef6575B7BBB864d984D9255C069F6c361a14",
   "Proxy__L2LiquidityPool": "0x3A92cA39476fF84Dc579C868D4D7dE125513B034",
   "L1MultiMessageRelayerFast": "0x2d6134Ac3e480fBDD263B7163d333dCA285f9622",
   "ERC721Registry": "0xcDcDa7D2a78AD9e74fD343d28Cad1Af6187014fc",
   "DiscretionaryExitBurn": "0x3256BD6Fc8b5fA48DB95914d0dF314465F3F7879",
+  "DiscretionaryExitFee": "0x1bD0A503EF149B188bFA31205028dB0401186107",
   "Timelock": "0xCc72f566Fd5C7EDeB8dAA4Fe394967f5546eC5B8",
   "GovernorBravoDelegate": "0xD3071443DdB9f98Ec11BD420c3a7df0C64e5030e",
   "GovernorBravoDelegator": "0x2CC555B5B1a4Cf7fA5401B29ab46fc5ba2e205b0",
@@ -69,8 +70,8 @@
   "Proxy__BobaFixedSavings": "0x9Fb3051148ff6EFCD0B5bA0Afa22EB0B9fC67A69",
   "BobaAirdropL1": "0xF5dBd4Cedc64f97Cbc01aB4A9210e41864aac17a",
   "BobaAirdropL2": "0x0A1f3CB6E19083C5d72046489487077Beae4D469",
-  "L1NFTBridge": "0xb8888346C0caBF99b6F9C35d028590Dee32684aE",
-  "L2NFTBridge": "0xE791c5A8aC5299bb946226d6E4864022c982371b",
+  "L1NFTBridge": "0x8DB3B7Db8A0f77e0E21178FcaD0A53E52bfdBA82",
+  "L2NFTBridge": "0xa87E6c7E8B9148f9Ef124344d6c384f8E20c3e14",
   "Proxy__L1NFTBridge": "0xC891F466e53f40603250837282eAE4e22aD5b088",
   "Proxy__L2NFTBridge": "0xFB823b65D0Dc219fdC0d759172D1E098dA32f9eb",
   "FeedRegistry": "0x01a109AB8603ad1B6Ef5f3B2B00d4847e6E554b1",
diff --git a/packages/boba/register/addresses/addressesRinkeby_0x93A96D6A5beb1F661cf052722A1424CDDA3e9418.json b/packages/boba/register/addresses/addressesRinkeby_0x93A96D6A5beb1F661cf052722A1424CDDA3e9418.json
index 7ca5568222..c8e3efbc8f 100644
--- a/packages/boba/register/addresses/addressesRinkeby_0x93A96D6A5beb1F661cf052722A1424CDDA3e9418.json
+++ b/packages/boba/register/addresses/addressesRinkeby_0x93A96D6A5beb1F661cf052722A1424CDDA3e9418.json
@@ -60,7 +60,7 @@
   "AtomicSwap": "0x903cABDe08F7765d201B470178e19ED1b4f48006",
   "L2ERC721": "0xEdf91A2fBB745e4651eb57659929813bC3C01f14",
   "L2ERC721Reg": "0xf296469f3303760D20197C2a2c9Ab2aDe02bfDEB",
-  "L1NFTBridge": "0x054DB39B7C859d1bCBfc156d3f7a5a2d00252115",
+  "L1NFTBridge": "0x64d5DDEBBA0fA7202E12FF663F0E77Bb4fc15E60",
   "L2NFTBridge": "0x3e5A63009c18e27218851F4d4DB07c695A4274E0",
   "Proxy__L1NFTBridge": "0x01F5d5D6de3a8c7A157B22FD331A1F177b7bE043",
   "Proxy__L2NFTBridge": "0x5E368E9dce71B624D7DdB155f360E7A4969eB7aA",