diff --git a/apollo/.env.test b/apollo/.env.test
index 58d16aff..ed92dbf7 100644
--- a/apollo/.env.test
+++ b/apollo/.env.test
@@ -25,6 +25,6 @@ ARBITRUM_LNV3_ENDPOINT=https://api.studio.thegraph.com/query/61328/lnv3-arbitrum
 ZKSYNC_LNV3_ENDPOINT=https://api.studio.thegraph.com/query/61328/lnv3-zksepolia/v1.0.5
 
 XTOKEN_DARWINIA = https://thegraph-g2.darwinia.network/helix/subgraphs/name/xtokentransfer/pangolin
-XTOKEN_ETHEREUM = https://api.studio.thegraph.com/query/61328/xtoken-sepolia/v1.0.5
+XTOKEN_ETHEREUM = https://api.studio.thegraph.com/query/61328/xtoken-sepolia/v1.1.3
 XTOKEN_DISPATCH_DARWINIA = https://thegraph-g2.darwinia.network/helix/subgraphs/name/xtokendispatch/pangolin
-XTOKEN_DISPATCH_ETHEREUM = https://api.studio.thegraph.com/query/61328/xtoken-dispatch-sepolia/v1.1.0
+XTOKEN_DISPATCH_ETHEREUM = https://api.studio.thegraph.com/query/61328/xtoken-dispatch-sepolia/v1.1.3
diff --git a/apollo/src/guard/guard.service.ts b/apollo/src/guard/guard.service.ts
index a5c8e411..67a5f02c 100644
--- a/apollo/src/guard/guard.service.ts
+++ b/apollo/src/guard/guard.service.ts
@@ -15,12 +15,12 @@ export class GuardService {
 
   private readonly guardConfig: GuardInfo[] = [
     {
-      fromChain: 'crab-dvm',
+      fromChain: 'pangolin-dvm',
       toChain: 'sepolia',
-      bridge: 'xtoken-crab-dvm',
+      bridge: 'xtoken-pangolin-dvm',
       chainId: 11155111,
-      depositor: '0xf22D0bb66b39745Ae6e3fEa3E5859d7f0b367Fd1',
-      contract: '0xcc357d5A8E5dBD52bC508E0FE491137d912F6bc8',
+      depositor: '0x371019523b25Ff4F26d977724f976566b08bf741',
+      contract: '0x3f200d3b6DA62bcA2F8a93F663b172A7f1AaE9ba',
     },
   ];
 
diff --git a/subgraph/xtoken/messageDispatcher/src/dispatch.ts b/subgraph/xtoken/messageDispatcher/src/dispatch.ts
index d942cbfe..3758d915 100644
--- a/subgraph/xtoken/messageDispatcher/src/dispatch.ts
+++ b/subgraph/xtoken/messageDispatcher/src/dispatch.ts
@@ -17,8 +17,8 @@ const STATUS_FAILED = 1;
 const STATUS_DELIVERED_SUCCESSED = 2;
 
 function isMsglineContract(event: ethereum.Log): boolean {
-    return event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a' ||
-        event.address.toHexString() == '0x00000000046bc530804d66b6b64f7af69b4e4e81';
+    return event.address.toHexString() == '0x0000000005d961f950ada391c1511c92bbc64d9f' ||
+        event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a';
 }
 
 function isMsglineDispatchEvent(event: ethereum.Log): boolean {
diff --git a/subgraph/xtoken/transfer/src/xTokenBacking.ts b/subgraph/xtoken/transfer/src/xTokenBacking.ts
index 6e5c0de2..b0593b7b 100644
--- a/subgraph/xtoken/transfer/src/xTokenBacking.ts
+++ b/subgraph/xtoken/transfer/src/xTokenBacking.ts
@@ -8,8 +8,8 @@ import { xTokenNonceOrder, TransferRecord, RefundTransferRecord } from "../gener
 const transferNonceId = "0x01";
 
 function isMsglineContract(event: ethereum.Log): boolean {
-    return event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a' ||
-        event.address.toHexString() == '0x00000000046bc530804d66b6b64f7af69b4e4e81';
+    return event.address.toHexString() == '0x0000000005d961f950ada391c1511c92bbc64d9f' ||
+        event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a';
 }
 
 function isMsglineAcceptEvent(event: ethereum.Log): boolean {
diff --git a/subgraph/xtoken/transfer/src/xTokenIssuing.ts b/subgraph/xtoken/transfer/src/xTokenIssuing.ts
index e849b976..8893b002 100644
--- a/subgraph/xtoken/transfer/src/xTokenIssuing.ts
+++ b/subgraph/xtoken/transfer/src/xTokenIssuing.ts
@@ -8,8 +8,8 @@ import { xTokenNonceOrder, TransferRecord, RefundTransferRecord } from "../gener
 const transferNonceId = "0x01";
 
 function isMsglineContract(event: ethereum.Log): boolean {
-    return event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a' ||
-        event.address.toHexString() == '0x00000000046bc530804d66b6b64f7af69b4e4e81';
+    return event.address.toHexString() == '0x0000000005d961f950ada391c1511c92bbc64d9f' ||
+        event.address.toHexString() == '0x00000000001523057a05d6293c1e5171ee33ee0a';
 }
 
 function isMsglineAcceptEvent(event: ethereum.Log): boolean {