diff --git a/README.md b/README.md
index a5873812..e8c022a6 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,14 @@ FUEL TESTNET
 
 Pyth Oracle contract = 0x73591bf32f010ce4e83d86005c24e7833b397be38014ab670a73f6fde59ad607
 
-Token factory contract = 0x36d896016b570d6638029968e6cdf84b9249ad7e5b295848f7140b56b3303532
+Token factory contract = 0x375745fb68ab9faf2f6754e4419148bd7d2c4a7b9be4eb2d1b25973da24bb995
 
-Market contract = 0xea9d4a55ca16271f42992529bb68de095249ceb8d95176576098bb9b98cd3975
+Market contract = 0xa31be85925a6031182aff87e9b41509050f17eeaea20311493e1e2753a6a1798
 
 ETH  = 0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07
-USDC = 0xb5a7ec61506d83f6e4739be2dc57018898b1e08684c097c73b582c9583e191e2
-UNI  = 0xf7c5f807c40573b5db88e467eb9aabc42332483493f7697442e1edbd59e020ad
-BTC  = 0x00dc5cda67b6a53b60fa53f95570fdaabb5b916c0e6d614a3f5d9de68f832e61
+USDC = 0x59240b41654b1e675b8280829849fe07d7e5ca23cbe9005a2bfd81b223583d48
+UNI  = 0x86809caacde769ebcde2e8ccf805722d32815f80420842bf0358554acf4554e7
+BTC  = 0x1090609b0f2017b401253d1e61e17d3de3fa4a3d0a2bbe5c0e1d64f9ba972ed7
 ```
 
 ---
diff --git a/apps/frontend/src/constants/index.ts b/apps/frontend/src/constants/index.ts
index c2d78e76..a406156a 100644
--- a/apps/frontend/src/constants/index.ts
+++ b/apps/frontend/src/constants/index.ts
@@ -42,9 +42,9 @@ export const FAUCET_URL = 'https://faucet-testnet.fuel.network/';
 export const CONTRACT_ADDRESSES: IContractsConfig = {
   priceOracle:
     '0x73591bf32f010ce4e83d86005c24e7833b397be38014ab670a73f6fde59ad607',
-  market: '0xea9d4a55ca16271f42992529bb68de095249ceb8d95176576098bb9b98cd3975',
+  market: '0xa31be85925a6031182aff87e9b41509050f17eeaea20311493e1e2753a6a1798',
   tokenFactory:
-    '0x36d896016b570d6638029968e6cdf84b9249ad7e5b295848f7140b56b3303532',
+    '0x375745fb68ab9faf2f6754e4419148bd7d2c4a7b9be4eb2d1b25973da24bb995',
 };
 
 export interface IToken {
diff --git a/apps/frontend/src/constants/tokens.testnet.json b/apps/frontend/src/constants/tokens.testnet.json
index 7877ad8c..ba004f00 100644
--- a/apps/frontend/src/constants/tokens.testnet.json
+++ b/apps/frontend/src/constants/tokens.testnet.json
@@ -9,18 +9,18 @@
     "name": "USDC",
     "symbol": "USDC",
     "decimals": 6,
-    "assetId": "0xb5a7ec61506d83f6e4739be2dc57018898b1e08684c097c73b582c9583e191e2"
+    "assetId": "0x59240b41654b1e675b8280829849fe07d7e5ca23cbe9005a2bfd81b223583d48"
   },
   {
     "name": "Bitcoin",
     "symbol": "BTC",
     "decimals": 8,
-    "assetId": "0x00dc5cda67b6a53b60fa53f95570fdaabb5b916c0e6d614a3f5d9de68f832e61"
+    "assetId": "0x1090609b0f2017b401253d1e61e17d3de3fa4a3d0a2bbe5c0e1d64f9ba972ed7"
   },
   {
     "name": "Uniswap",
     "symbol": "UNI",
     "decimals": 9,
-    "assetId": "0xf7c5f807c40573b5db88e467eb9aabc42332483493f7697442e1edbd59e020ad"
+    "assetId": "0x86809caacde769ebcde2e8ccf805722d32815f80420842bf0358554acf4554e7"
   }
 ]
diff --git a/apps/indexer/config.yaml b/apps/indexer/config.yaml
index 5fed0048..0662aaf2 100644
--- a/apps/indexer/config.yaml
+++ b/apps/indexer/config.yaml
@@ -1,10 +1,10 @@
 name: Fuel Greeter Indexer
 networks:
   - id: 0
-    start_block: 7597567
+    start_block: 8386611
     contracts:
       - name: Market
-        address: 0xea9d4a55ca16271f42992529bb68de095249ceb8d95176576098bb9b98cd3975
+        address: 0xa31be85925a6031182aff87e9b41509050f17eeaea20311493e1e2753a6a1798
         abi_file_path: ../../contracts/market/out/release/market-abi.json
         handler: ./src/EventHandlers.ts
         events:
diff --git a/libs/token_sdk/tokens.testnet.json b/libs/token_sdk/tokens.testnet.json
index f2d611d0..076d4eb0 100644
--- a/libs/token_sdk/tokens.testnet.json
+++ b/libs/token_sdk/tokens.testnet.json
@@ -1,6 +1,6 @@
 [
   {
-    "asset_id": "0xb5a7ec61506d83f6e4739be2dc57018898b1e08684c097c73b582c9583e191e2",
+    "asset_id": "0x59240b41654b1e675b8280829849fe07d7e5ca23cbe9005a2bfd81b223583d48",
     "price_feed_id": "0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a",
     "price_feed_decimals": 7,
     "name": "USD Coin",
@@ -24,7 +24,7 @@
     "supply_cap": 2000000000000000000000
   },
   {
-    "asset_id": "0x00dc5cda67b6a53b60fa53f95570fdaabb5b916c0e6d614a3f5d9de68f832e61",
+    "asset_id": "0x1090609b0f2017b401253d1e61e17d3de3fa4a3d0a2bbe5c0e1d64f9ba972ed7",
     "price_feed_id": "0xe62df6c8b4a85fe1a67db44dc12de5db330f7ac66b72dc658afedf0f4a415b43",
     "price_feed_decimals": 7,
     "name": "Bitcoin",
@@ -38,7 +38,7 @@
     "supply_cap": 1000000000000000000000
   },
   {
-    "asset_id": "0xf7c5f807c40573b5db88e467eb9aabc42332483493f7697442e1edbd59e020ad",
+    "asset_id": "0x86809caacde769ebcde2e8ccf805722d32815f80420842bf0358554acf4554e7",
     "price_feed_id": "0x78d185a741d07edb3412b09008b7c5cfb9bbbd7d568bf00ba737b456ba171501",
     "price_feed_decimals": 8,
     "name": "Uniswap",