diff --git a/src/boot/api.ts b/src/boot/api.ts
index 8d89896a3..023c02181 100644
--- a/src/boot/api.ts
+++ b/src/boot/api.ts
@@ -133,7 +133,7 @@ export default boot(async ({ store }) => {
   watchPostEffect(async () => {
     store.commit('general/setChainInfo', chainInfo.value);
     const networkIdx = store.getters['general/networkIdx'];
-    const isZkEvm = networkIdx === endpointKey.ZKATANA || networkIdx === endpointKey.ASTAR_ZKEVM;
+    const isZkEvm = networkIdx === endpointKey.ZKYOTO || networkIdx === endpointKey.ASTAR_ZKEVM;
 
     if (isZkEvm) {
       await setWeb3(networkIdx);
diff --git a/src/components/assets/Account.vue b/src/components/assets/Account.vue
index 24981324e..80e909186 100644
--- a/src/components/assets/Account.vue
+++ b/src/components/assets/Account.vue
@@ -11,7 +11,7 @@
               <!-- zkEVM -->
               <template v-if="isZkEvm">
                 <a class="btn" href="/shibuya-testnet/assets"> Shibuya EVM (L1) </a>
-                <div v-if="isZkEvm" class="btn active">Astar zKatana</div>
+                <div v-if="isZkEvm" class="btn active">Astar zKyoto</div>
               </template>
 
               <!-- Astar EVM -->
@@ -20,8 +20,8 @@
                   {{ currentNetworkName.replace('Network', '') }}
                   EVM (L1)
                 </div>
-                <a v-if="currentNetworkIdx === 2" class="btn" href="/zkatana-testnet/assets">
-                  Astar zKatana
+                <a v-if="currentNetworkIdx === 2" class="btn" href="/zkyoto-testnet/assets">
+                  Astar zKyoto
                 </a>
                 <a v-else-if="currentNetworkIdx !== 1" class="btn" disabled>Astar zkEVM</a>
               </template>
@@ -282,7 +282,7 @@ export default defineComponent({
         return bg_img.native;
       } else if (currentNetworkIdx.value === endpointKey.SHIDEN) {
         return bg_img.shiden;
-      } else if (currentNetworkIdx.value === endpointKey.ZKATANA) {
+      } else if (currentNetworkIdx.value === endpointKey.ZKYOTO) {
         return bg_img.testnet_zk;
       }
       return bg_img.testnet;
diff --git a/src/components/assets/EvmNativeToken.vue b/src/components/assets/EvmNativeToken.vue
index 68d179a53..eb41cacb8 100644
--- a/src/components/assets/EvmNativeToken.vue
+++ b/src/components/assets/EvmNativeToken.vue
@@ -56,7 +56,7 @@
           </q-tooltip>
         </a>
 
-        <a v-if="isZkatana" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
+        <a v-if="isZkyoto" :href="faucetSethLink" target="_blank" rel="noopener noreferrer">
           <button class="btn btn--icon">
             <astar-icon-faucet />
           </button>
@@ -105,7 +105,7 @@ export default defineComponent({
     const isFaucet = ref<boolean>(false);
     const isModalFaucet = ref<boolean>(false);
 
-    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isZkatana } = useNetworkInfo();
+    const { currentNetworkName, nativeTokenSymbol, isZkEvm, isZkyoto } = useNetworkInfo();
     const { currentAccount } = useAccount();
     const { nativeTokenUsd } = usePrice();
     const store = useStore();
@@ -161,7 +161,7 @@ export default defineComponent({
       isFaucet,
       isModalFaucet,
       isZkEvm,
-      isZkatana,
+      isZkyoto,
       faucetSethLink,
       width,
       screenSize,
diff --git a/src/components/assets/styles/account.scss b/src/components/assets/styles/account.scss
index fca31ea71..a4e9d38c2 100644
--- a/src/components/assets/styles/account.scss
+++ b/src/components/assets/styles/account.scss
@@ -128,7 +128,7 @@
     }
   }
 
-  // zKatana
+  // zKyoto
   &.network-4 {
     .text--address {
       background: linear-gradient(90deg, #6c6c6c 25%, #b7b7b7 100%);
@@ -334,7 +334,7 @@
     }
   }
 
-  // zKatana
+  // zKyoto
   &.network-4 {
     .wallet-tab {
       .btn {
diff --git a/src/components/bridge/BridgeSelection.vue b/src/components/bridge/BridgeSelection.vue
index 131e9fbd6..589ca2433 100644
--- a/src/components/bridge/BridgeSelection.vue
+++ b/src/components/bridge/BridgeSelection.vue
@@ -97,19 +97,19 @@ export default defineComponent({
     const { isZkEvm, currentNetworkName, networkNameSubstrate, isMainnet } = useNetworkInfo();
 
     const l1Name = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkatana
+      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
         ? EthBridgeNetworkName.Sepolia
         : EthBridgeNetworkName.Ethereum;
     });
 
     const l2Name = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkatana
-        ? EthBridgeNetworkName.Zkatana
+      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto
+        ? EthBridgeNetworkName.Zkyoto
         : EthBridgeNetworkName.AstarZk;
     });
 
     const substrateNetwork = computed<string>(() => {
-      return currentNetworkName.value === EthBridgeNetworkName.Zkatana ? 'Shibuya' : 'Astar';
+      return currentNetworkName.value === EthBridgeNetworkName.Zkyoto ? 'Shibuya' : 'Astar';
     });
 
     const cbridgeNetworkName = computed<string>(() => {
diff --git a/src/components/bridge/common/ImportTokenInfo.vue b/src/components/bridge/common/ImportTokenInfo.vue
index 95b0ef6e1..a5699782d 100644
--- a/src/components/bridge/common/ImportTokenInfo.vue
+++ b/src/components/bridge/common/ImportTokenInfo.vue
@@ -227,10 +227,10 @@ export default defineComponent({
           return String(blockExplorerUrls[EVM.SEPOLIA_TESTNET][0]);
         case EthBridgeNetworkName.AstarZk:
           return String(blockExplorerUrls[EVM.ASTAR_ZKEVM_MAINNET][0]);
-        case EthBridgeNetworkName.Zkatana:
-          return String(blockExplorerUrls[EVM.ZKATANA_TESTNET][0]);
+        case EthBridgeNetworkName.Zkyoto:
+          return String(blockExplorerUrls[EVM.ZKYOTO_TESTNET][0]);
         default:
-          return String(blockExplorerUrls[EVM.ZKATANA_TESTNET][0]);
+          return String(blockExplorerUrls[EVM.ZKYOTO_TESTNET][0]);
       }
     };
 
diff --git a/src/components/bridge/ethereum/L1Bridge.vue b/src/components/bridge/ethereum/L1Bridge.vue
index f61569555..ec06df410 100644
--- a/src/components/bridge/ethereum/L1Bridge.vue
+++ b/src/components/bridge/ethereum/L1Bridge.vue
@@ -275,16 +275,15 @@ export default defineComponent({
       isHandling.value = false;
     };
 
-    // Watching the 'isApproved' prop
-    // When 'isApproved' changes and becomes true, stop loading animation
     watch(
-      () => props.isApproved,
-      async (newVal, oldVal) => {
-        if (newVal === true) {
+      [props],
+      () => {
+        if (props.isApproved) {
           props.setIsApproving(false);
           store.commit('general/setLoading', false, { root: true });
         }
-      }
+      },
+      { immediate: false }
     );
 
     return {
diff --git a/src/components/bridge/ethereum/L1History.vue b/src/components/bridge/ethereum/L1History.vue
index 89ea18da1..9421a1a93 100644
--- a/src/components/bridge/ethereum/L1History.vue
+++ b/src/components/bridge/ethereum/L1History.vue
@@ -246,8 +246,8 @@ export default defineComponent({
           return blockExplorerUrls[EVM.ETHEREUM_MAINNET] + txUrl;
         case EthBridgeNetworkName.Sepolia:
           return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
-        case EthBridgeNetworkName.Zkatana:
-          return blockExplorerUrls[EVM.ZKATANA_TESTNET] + txUrl;
+        case EthBridgeNetworkName.Zkyoto:
+          return blockExplorerUrls[EVM.ZKYOTO_TESTNET] + txUrl;
         case EthBridgeNetworkName.AstarZk:
           return blockExplorerUrls[EVM.SEPOLIA_TESTNET] + txUrl;
 
diff --git a/src/components/header/ClaimWarningBanner.vue b/src/components/header/ClaimWarningBanner.vue
index 69c17c32c..0af607021 100644
--- a/src/components/header/ClaimWarningBanner.vue
+++ b/src/components/header/ClaimWarningBanner.vue
@@ -54,7 +54,7 @@ export default defineComponent({
     padding: 4px 16px 8px 16px;
   }
 
-  // shibuya, zKatana, local
+  // shibuya, zkyoto, local
   background: linear-gradient(90deg, #6c6c6c 25%, #b7b7b7 100%);
 
   // astar native
diff --git a/src/components/header/HeaderComp.vue b/src/components/header/HeaderComp.vue
index deda345c5..79baa1bdc 100644
--- a/src/components/header/HeaderComp.vue
+++ b/src/components/header/HeaderComp.vue
@@ -51,7 +51,7 @@ export default defineComponent({
     height: 6rem;
   }
 
-  // shibuya, zKatana, local
+  // shibuya, zkyoto, local
   border-image: linear-gradient(90deg, #6c6c6c 25%, #b7b7b7 100%);
   border-image-slice: 1;
 
diff --git a/src/components/header/mobile/MobileNav.vue b/src/components/header/mobile/MobileNav.vue
index dc8682af6..0c275a21f 100644
--- a/src/components/header/mobile/MobileNav.vue
+++ b/src/components/header/mobile/MobileNav.vue
@@ -38,7 +38,7 @@
           </router-link>
 
           <button
-            v-if="isZkatana"
+            v-if="isZkyoto"
             :disabled="true"
             :class="['link', path === 'dashboard' && 'active-link']"
           >
@@ -114,7 +114,7 @@ export default defineComponent({
     const showNav = ref<boolean>(false);
     const router = useRouter();
     const path = computed(() => router.currentRoute.value.path.split('/')[2]);
-    const { isZkatana } = useNetworkInfo();
+    const { isZkyoto } = useNetworkInfo();
 
     const store = useStore();
     const currentNetworkIdx = computed(() => store.getters['general/networkIdx']);
@@ -127,7 +127,7 @@ export default defineComponent({
       path,
       RoutePath,
       network,
-      isZkatana,
+      isZkyoto,
     };
   },
 });
diff --git a/src/components/header/modals/ModalNetworkWallet.vue b/src/components/header/modals/ModalNetworkWallet.vue
index 0332f68d4..72958f698 100644
--- a/src/components/header/modals/ModalNetworkWallet.vue
+++ b/src/components/header/modals/ModalNetworkWallet.vue
@@ -167,7 +167,7 @@ export default defineComponent({
     const selEndpointShiden = ref<string>('');
     const selEndpointShibuya = ref<string>('');
     const selEndpointAstarZkevm = ref<string>('');
-    const selEndpointZkatana = ref<string>('');
+    const selEndpointZkyoto = ref<string>('');
 
     const setIsAnimatedIn = (result: boolean): void => {
       isAnimatedIn.value = result;
@@ -183,7 +183,7 @@ export default defineComponent({
     const isH160 = computed<boolean>(() => store.getters['general/isH160Formatted']);
     const isZkEvm = computed<boolean>(
       () =>
-        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKATANA
+        selNetworkId.value === endpointKey.ASTAR_ZKEVM || selNetworkId.value === endpointKey.ZKYOTO
     );
 
     const setInitialCustomEndpoint = (): string => {
@@ -218,8 +218,8 @@ export default defineComponent({
           return selEndpointShiden.value;
         case endpointKey.SHIBUYA:
           return selEndpointShibuya.value;
-        case endpointKey.ZKATANA:
-          return selEndpointZkatana.value;
+        case endpointKey.ZKYOTO:
+          return selEndpointZkyoto.value;
         case endpointKey.ASTAR_ZKEVM:
           return selEndpointAstarZkevm.value;
 
@@ -318,7 +318,7 @@ export default defineComponent({
         ? selEndpointShibuya.value === endpoint
         : index === endpointKey.ASTAR_ZKEVM
         ? selEndpointAstarZkevm.value === endpoint
-        : selEndpointZkatana.value === endpoint;
+        : selEndpointZkyoto.value === endpoint;
     };
 
     const setSelNetwork = (networkId: number): void => {
@@ -340,8 +340,8 @@ export default defineComponent({
         selEndpointShibuya.value = endpointObj.endpoint;
       } else if (networkIdx === endpointKey.ASTAR_ZKEVM) {
         selEndpointAstarZkevm.value = endpointObj.endpoint;
-      } else if (networkIdx === endpointKey.ZKATANA) {
-        selEndpointZkatana.value = endpointObj.endpoint;
+      } else if (networkIdx === endpointKey.ZKYOTO) {
+        selEndpointZkyoto.value = endpointObj.endpoint;
       }
     };
 
@@ -365,8 +365,8 @@ export default defineComponent({
       if (networkIdx === endpointKey.ASTAR_ZKEVM) {
         selEndpointAstarZkevm.value = getRandomizedEndpoint(endpointKey.ASTAR_ZKEVM);
       }
-      if (networkIdx === endpointKey.ZKATANA) {
-        selEndpointZkatana.value = getRandomizedEndpoint(endpointKey.ZKATANA);
+      if (networkIdx === endpointKey.ZKYOTO) {
+        selEndpointZkyoto.value = getRandomizedEndpoint(endpointKey.ZKYOTO);
       }
     };
 
@@ -376,7 +376,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.SHIBUYA);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKATANA);
+        randomizedEndpoint(endpointKey.ZKYOTO);
         return;
       }
 
@@ -385,7 +385,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIBUYA);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKATANA);
+        randomizedEndpoint(endpointKey.ZKYOTO);
         return;
       }
 
@@ -394,7 +394,7 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.ASTAR_ZKEVM);
-        randomizedEndpoint(endpointKey.ZKATANA);
+        randomizedEndpoint(endpointKey.ZKYOTO);
         return;
       }
       if (networkIdx === endpointKey.ASTAR_ZKEVM) {
@@ -402,10 +402,10 @@ export default defineComponent({
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
         randomizedEndpoint(endpointKey.SHIBUYA);
-        randomizedEndpoint(endpointKey.ZKATANA);
+        randomizedEndpoint(endpointKey.ZKYOTO);
         return;
       }
-      if (networkIdx === endpointKey.ZKATANA) {
+      if (networkIdx === endpointKey.ZKYOTO) {
         selEndpointShibuya.value = setInitialSelEndpoint();
         randomizedEndpoint(endpointKey.ASTAR);
         randomizedEndpoint(endpointKey.SHIDEN);
diff --git a/src/components/header/modals/SelectNetwork.vue b/src/components/header/modals/SelectNetwork.vue
index c16d9b573..c386af1dd 100644
--- a/src/components/header/modals/SelectNetwork.vue
+++ b/src/components/header/modals/SelectNetwork.vue
@@ -60,8 +60,8 @@
         </button>
         <button
           class="row--network box--hover--active"
-          :class="selNetworkId === endpointKey.ZKATANA && 'border--active'"
-          @click="setSelNetwork(endpointKey.ZKATANA)"
+          :class="selNetworkId === endpointKey.ZKYOTO && 'border--active'"
+          @click="setSelNetwork(endpointKey.ZKYOTO)"
         >
           <img
             class="img--network-logo"
diff --git a/src/components/sidenav/SidebarDesktop.vue b/src/components/sidenav/SidebarDesktop.vue
index 6792e9158..1589609cb 100644
--- a/src/components/sidenav/SidebarDesktop.vue
+++ b/src/components/sidenav/SidebarDesktop.vue
@@ -23,7 +23,7 @@
       </div>
       <div>
         <button
-          v-if="isZkatana"
+          v-if="isZkyoto"
           :disabled="true"
           class="link--disabled"
           :class="['link', $route.path.split('/')[2] === 'dashboard' ? 'activeLink' : '']"
@@ -143,7 +143,7 @@ export default defineComponent({
   },
   setup() {
     const { isOpen } = useSidebar();
-    const { isZkEvm, isZkatana } = useNetworkInfo();
+    const { isZkEvm, isZkyoto } = useNetworkInfo();
 
     const store = useStore();
     const currentNetworkIdx = computed<number>(() => store.getters['general/networkIdx']);
@@ -179,7 +179,7 @@ export default defineComponent({
       path,
       RoutePath,
       socialUrl,
-      isZkatana,
+      isZkyoto,
     };
   },
 });
diff --git a/src/config/chain.ts b/src/config/chain.ts
index 90f467773..8aa9f5c98 100644
--- a/src/config/chain.ts
+++ b/src/config/chain.ts
@@ -6,7 +6,7 @@ export enum astarChain {
   ASTAR = 'Astar',
   DEVELOPMENT = 'Development',
   ASTAR_ZKEVM = 'Astar zkEVM',
-  ZKATANA = 'zKatana Testnet',
+  ZKYOTO = 'zKyoto Testnet',
   ROCSTAR = 'Rocstar Testnet',
 }
 
@@ -15,7 +15,7 @@ export type ASTAR_CHAIN =
   | astarChain.ASTAR
   | astarChain.SHIBUYA
   | astarChain.ASTAR_ZKEVM
-  | astarChain.ZKATANA
+  | astarChain.ZKYOTO
   | astarChain.DEVELOPMENT
   | astarChain.ROCSTAR;
 
@@ -24,12 +24,12 @@ export type ASTAR_NETWORK_IDX =
   | endpointKey.SHIDEN
   | endpointKey.SHIBUYA
   | endpointKey.ASTAR_ZKEVM
-  | endpointKey.ZKATANA
+  | endpointKey.ZKYOTO
   | endpointKey.LOCAL
   | endpointKey.ROCSTAR;
 
 //Todo: add Astar zkEVM
-export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 7759;
+export type ASTAR_EVM_NETWORK_IDX = 592 | 336 | 81 | 4369 | 692 | 7759 | 6038361;
 
 export type ASTAR_NATIVE_TOKEN = 'ASTR' | 'SDN' | 'SBY' | 'LOC' | 'RSTR' | 'ETH';
 export const astarMainnetNativeToken: ASTAR_NATIVE_TOKEN[] = ['ASTR', 'SDN'];
diff --git a/src/config/chainEndpoints.ts b/src/config/chainEndpoints.ts
index 8d46363e3..86a4e9c1c 100644
--- a/src/config/chainEndpoints.ts
+++ b/src/config/chainEndpoints.ts
@@ -28,7 +28,7 @@ export enum endpointKey {
   SHIDEN = 1,
   SHIBUYA = 2,
   ASTAR_ZKEVM = 3,
-  ZKATANA = 4,
+  ZKYOTO = 4,
   LOCAL = 5,
   CUSTOM = 6,
   ROCSTAR = 7,
@@ -139,20 +139,20 @@ export const providerEndpoints: ChainProvider[] = [
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',
   },
   {
-    networkAlias: 'zkatana-testnet',
-    displayName: 'zKatana Network',
+    networkAlias: 'zkyoto-testnet',
+    displayName: 'zKyoto Network',
     endpoints: [
       { name: 'Shibuya', endpoint: 'wss://rpc.shibuya.astar.network' },
       { name: 'Dwellir', endpoint: 'wss://shibuya-rpc.dwellir.com' },
     ],
     isSupportContract: false,
     typeDef: typeDefs.plasmCollatorDefinitions,
-    key: endpointKey.ZKATANA,
+    key: endpointKey.ZKYOTO,
     isStoreEnabled: true,
     subscan: 'https://shibuya.subscan.io',
-    blockscout: 'https://zkatana.explorer.startale.com',
-    evmChainId: '1261120',
-    evmEndpoints: ['https://rpc.startale.com/zkatana', 'https://rpc.zkatana.gelato.digital'],
+    blockscout: 'https://explorer.zkyoto.gelato.digital',
+    evmChainId: '6038361',
+    evmEndpoints: ['https://rpc.zkyoto.gelato.digital'],
     faucetEndpoint: '',
     defaultLogo:
       'https://github.com/AstarNetwork/astar-apps/blob/main/src/assets/img/chain/zkatana-logo.png?raw=true',
diff --git a/src/config/web3/abi/zkevm-bridge-abi.json b/src/config/web3/abi/zkevm-bridge-abi.json
index 60bbd82fb..435d36b1d 100644
--- a/src/config/web3/abi/zkevm-bridge-abi.json
+++ b/src/config/web3/abi/zkevm-bridge-abi.json
@@ -19,6 +19,11 @@
     "name": "EtherTransferFailed",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "GasTokenNetworkMustBeZeroOnEther",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "GlobalExitRootInvalid",
@@ -44,6 +49,16 @@
     "name": "MsgValueNotZero",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "NativeTokenIsEther",
+    "type": "error"
+  },
+  {
+    "inputs": [],
+    "name": "NoValueInMessagesOnGasTokenNetworks",
+    "type": "error"
+  },
   {
     "inputs": [],
     "name": "NotValidAmount",
@@ -76,7 +91,7 @@
   },
   {
     "inputs": [],
-    "name": "OnlyPolygonZkEVM",
+    "name": "OnlyRollupManager",
     "type": "error"
   },
   {
@@ -139,9 +154,9 @@
     "inputs": [
       {
         "indexed": false,
-        "internalType": "uint32",
-        "name": "index",
-        "type": "uint32"
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
       },
       {
         "indexed": false,
@@ -227,6 +242,19 @@
     "name": "NewWrappedToken",
     "type": "event"
   },
+  {
+    "inputs": [],
+    "name": "WETHToken",
+    "outputs": [
+      {
+        "internalType": "contract TokenWrapped",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "activateEmergencyState",
@@ -302,6 +330,44 @@
   },
   {
     "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "destinationNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "destinationAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amountWETH",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bool",
+        "name": "forceUpdateGlobalExitRoot",
+        "type": "bool"
+      },
+      {
+        "internalType": "bytes",
+        "name": "metadata",
+        "type": "bytes"
+      }
+    ],
+    "name": "bridgeMessageWETH",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32",
+        "name": "leafHash",
+        "type": "bytes32"
+      },
       {
         "internalType": "bytes32[32]",
         "name": "smtProof",
@@ -311,6 +377,64 @@
         "internalType": "uint32",
         "name": "index",
         "type": "uint32"
+      }
+    ],
+    "name": "calculateRoot",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint32",
+        "name": "originNetwork",
+        "type": "uint32"
+      },
+      {
+        "internalType": "address",
+        "name": "originTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      }
+    ],
+    "name": "calculateTokenWrapperAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofLocalExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "bytes32[32]",
+        "name": "smtProofRollupExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
       },
       {
         "internalType": "bytes32",
@@ -362,13 +486,18 @@
     "inputs": [
       {
         "internalType": "bytes32[32]",
-        "name": "smtProof",
+        "name": "smtProofLocalExitRoot",
         "type": "bytes32[32]"
       },
       {
-        "internalType": "uint32",
-        "name": "index",
-        "type": "uint32"
+        "internalType": "bytes32[32]",
+        "name": "smtProofRollupExitRoot",
+        "type": "bytes32[32]"
+      },
+      {
+        "internalType": "uint256",
+        "name": "globalIndex",
+        "type": "uint256"
       },
       {
         "internalType": "bytes32",
@@ -457,12 +586,38 @@
   },
   {
     "inputs": [],
-    "name": "getDepositRoot",
+    "name": "gasTokenAddress",
     "outputs": [
       {
-        "internalType": "bytes32",
+        "internalType": "address",
         "name": "",
-        "type": "bytes32"
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasTokenMetadata",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "gasTokenNetwork",
+    "outputs": [
+      {
+        "internalType": "uint32",
+        "name": "",
+        "type": "uint32"
       }
     ],
     "stateMutability": "view",
@@ -517,6 +672,38 @@
     "stateMutability": "pure",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "getRoot",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "token",
+        "type": "address"
+      }
+    ],
+    "name": "getTokenMetadata",
+    "outputs": [
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -561,6 +748,16 @@
         "name": "_networkID",
         "type": "uint32"
       },
+      {
+        "internalType": "address",
+        "name": "_gasTokenAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint32",
+        "name": "_gasTokenNetwork",
+        "type": "uint32"
+      },
       {
         "internalType": "contract IBasePolygonZkEVMGlobalExitRoot",
         "name": "_globalExitRootManager",
@@ -568,8 +765,13 @@
       },
       {
         "internalType": "address",
-        "name": "_polygonZkEVMaddress",
+        "name": "_polygonRollupManager",
         "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_gasTokenMetadata",
+        "type": "bytes"
       }
     ],
     "name": "initialize",
@@ -580,9 +782,14 @@
   {
     "inputs": [
       {
-        "internalType": "uint256",
-        "name": "index",
-        "type": "uint256"
+        "internalType": "uint32",
+        "name": "leafIndex",
+        "type": "uint32"
+      },
+      {
+        "internalType": "uint32",
+        "name": "sourceBridgeNetwork",
+        "type": "uint32"
       }
     ],
     "name": "isClaimed",
@@ -637,7 +844,7 @@
   },
   {
     "inputs": [],
-    "name": "polygonZkEVMaddress",
+    "name": "polygonRollupManager",
     "outputs": [
       {
         "internalType": "address",
@@ -771,4 +978,4 @@
     "stateMutability": "view",
     "type": "function"
   }
-]
+]
\ No newline at end of file
diff --git a/src/config/web3/index.ts b/src/config/web3/index.ts
index 3e63cb96d..7fca21a3d 100644
--- a/src/config/web3/index.ts
+++ b/src/config/web3/index.ts
@@ -22,7 +22,7 @@ export type TNetworkId =
   | endpointKey.SHIBUYA
   | endpointKey.ASTAR
   | endpointKey.ASTAR_ZKEVM
-  | endpointKey.ZKATANA;
+  | endpointKey.ZKYOTO;
 
 const chain = {
   shiden: providerEndpoints.find((it) => it.key === endpointKey.SHIDEN),
@@ -31,7 +31,7 @@ const chain = {
   localNode: providerEndpoints.find((it) => it.key === endpointKey.LOCAL),
   rocstar: providerEndpoints.find((it) => it.key === endpointKey.ROCSTAR),
   astarZkEvm: providerEndpoints.find((it) => it.key === endpointKey.ASTAR_ZKEVM),
-  zKatana: providerEndpoints.find((it) => it.key === endpointKey.ZKATANA),
+  zKyoto: providerEndpoints.find((it) => it.key === endpointKey.ZKYOTO),
 };
 
 export enum EVM {
@@ -41,7 +41,7 @@ export enum EVM {
   ASTAR_LOCAL_NODE = Number(chain.localNode!.evmChainId),
   ROCSTAR_TESTNET = Number(chain.rocstar!.evmChainId),
   ASTAR_ZKEVM_MAINNET = Number(chain.astarZkEvm!.evmChainId),
-  ZKATANA_TESTNET = Number(chain.zKatana!.evmChainId),
+  ZKYOTO_TESTNET = Number(chain.zKyoto!.evmChainId),
   ETHEREUM_MAINNET = 1,
   SEPOLIA_TESTNET = 11155111,
   BSC = 56,
@@ -57,7 +57,7 @@ export const chainName = {
   [EVM.SHIDEN_MAINNET]: 'Shiden Network Mainnet',
   [EVM.SHIBUYA_TESTNET]: 'Shibuya Testnet',
   [EVM.ASTAR_ZKEVM_MAINNET]: 'Astar zkEVM Mainnet',
-  [EVM.ZKATANA_TESTNET]: 'zKatana Testnet',
+  [EVM.ZKYOTO_TESTNET]: 'zKyoto Testnet',
   [EVM.ASTAR_LOCAL_NODE]: 'Astar Local Node',
   [EVM.ROCSTAR_TESTNET]: 'Rocstar',
   [EVM.BSC]: 'Binance Smart Chain',
@@ -102,7 +102,7 @@ export const nativeCurrency = {
     symbol: 'ETH',
     decimals: 18,
   },
-  [EVM.ZKATANA_TESTNET]: {
+  [EVM.ZKYOTO_TESTNET]: {
     name: 'ETH',
     symbol: 'ETH',
     decimals: 18,
@@ -144,7 +144,7 @@ export const rpcUrls = {
   [EVM.ROCSTAR_TESTNET]: [chain.rocstar?.evmEndpoints[0]],
   [EVM.ASTAR_MAINNET]: [chain.astar?.evmEndpoints[0]],
   [EVM.ASTAR_ZKEVM_MAINNET]: [chain.astarZkEvm?.evmEndpoints[0]],
-  [EVM.ZKATANA_TESTNET]: [chain.zKatana?.evmEndpoints[0]],
+  [EVM.ZKYOTO_TESTNET]: [chain.zKyoto?.evmEndpoints[0]],
   [EVM.ASTAR_LOCAL_NODE]: [chain.localNode?.evmEndpoints[0]],
   [EVM.BSC]: ['https://bsc-dataseed.binance.org'],
   [EVM.POLYGON]: ['https://rpc-mainnet.maticvigil.com'],
@@ -160,7 +160,7 @@ export const blockExplorerUrls = {
   [EVM.ROCSTAR_TESTNET]: [chain.rocstar?.blockscout],
   [EVM.ASTAR_MAINNET]: [chain.astar?.blockscout],
   [EVM.ASTAR_ZKEVM_MAINNET]: [chain.astarZkEvm?.blockscout],
-  [EVM.ZKATANA_TESTNET]: [chain.zKatana?.blockscout],
+  [EVM.ZKYOTO_TESTNET]: [chain.zKyoto?.blockscout],
   [EVM.BSC]: ['https://bscscan.com'],
   [EVM.POLYGON]: ['https://explorer.matic.network'],
   [EVM.MOONRIVER]: ['https://moonriver.moonscan.io'],
diff --git a/src/config/web3/utils/index.ts b/src/config/web3/utils/index.ts
index 578403199..f7bce2c15 100644
--- a/src/config/web3/utils/index.ts
+++ b/src/config/web3/utils/index.ts
@@ -107,8 +107,8 @@ export const getChainId = (currentNetworkIdx: endpointKey): number => {
     return EVM.ASTAR_LOCAL_NODE;
   } else if (currentNetworkIdx === endpointKey.ASTAR_ZKEVM) {
     return EVM.ASTAR_ZKEVM_MAINNET;
-  } else if (currentNetworkIdx === endpointKey.ZKATANA) {
-    return EVM.ZKATANA_TESTNET;
+  } else if (currentNetworkIdx === endpointKey.ZKYOTO) {
+    return EVM.ZKYOTO_TESTNET;
   }
   return EVM.SHIBUYA_TESTNET;
 };
@@ -271,7 +271,7 @@ export const fetchErc20TokenInfo = async ({
       contract.methods.symbol().call(),
     ]);
 
-    const isZkEvm = srcChainId === ZkChainId.AstarZk || srcChainId === ZkChainId.Zkatana;
+    const isZkEvm = srcChainId === ZkChainId.AstarZk || srcChainId === ZkChainId.Zkyoto;
 
     let bridgedTokenAddress = '';
     let toChainId;
diff --git a/src/hooks/bridge/useL1Bridge.ts b/src/hooks/bridge/useL1Bridge.ts
index 0d670b0ef..11533277e 100644
--- a/src/hooks/bridge/useL1Bridge.ts
+++ b/src/hooks/bridge/useL1Bridge.ts
@@ -1,25 +1,24 @@
+import { ethers, constants as ethersConstants } from 'ethers';
+import { debounce } from 'lodash-es'; // If using lodash
 import { endpointKey } from 'src/config/chainEndpoints';
 import { LOCAL_STORAGE } from 'src/config/localStorage';
-import { checkAllowance, getTokenBal } from 'src/config/web3';
+import { checkAllowance, getTokenBal, setupNetwork } from 'src/config/web3';
+import { useAccount } from 'src/hooks';
+import { Erc20Token } from 'src/modules/token';
+import { astarNativeTokenErcAddr } from 'src/modules/xcm';
 import {
   EthBridgeChainId,
   EthBridgeContract,
   EthBridgeNetworkName,
   ZkToken,
 } from 'src/modules/zk-evm-bridge';
-import { setupNetwork } from 'src/config/web3';
-import { useAccount } from 'src/hooks';
 import { useStore } from 'src/store';
 import { container } from 'src/v2/common';
 import { IZkBridgeService } from 'src/v2/services';
 import { Symbols } from 'src/v2/symbols';
-import { computed, ref, watch, watchEffect, onUnmounted } from 'vue';
+import { computed, onUnmounted, ref, watch, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useEthProvider } from '../custom-signature/useEthProvider';
-import { astarNativeTokenErcAddr } from 'src/modules/xcm';
-import { ethers, constants as ethersConstants } from 'ethers';
-import { Erc20Token } from 'src/modules/token';
-import { debounce } from 'lodash-es'; // If using lodash
 
 const eth = {
   symbol: 'ETH',
@@ -43,7 +42,7 @@ export const useL1Bridge = () => {
     const networkIdxStore = String(localStorage.getItem(LOCAL_STORAGE.NETWORK_IDX));
     return networkIdxStore === String(endpointKey.ASTAR_ZKEVM)
       ? EthBridgeNetworkName.AstarZk
-      : EthBridgeNetworkName.Zkatana;
+      : EthBridgeNetworkName.Zkyoto;
   });
 
   const zkTokens = ref<ZkToken[]>([]);
diff --git a/src/hooks/bridge/useL1History.ts b/src/hooks/bridge/useL1History.ts
index 5041380b4..e80e3b808 100644
--- a/src/hooks/bridge/useL1History.ts
+++ b/src/hooks/bridge/useL1History.ts
@@ -32,7 +32,7 @@ export const useL1History = () => {
     const networkIdxStore = String(localStorage.getItem(LOCAL_STORAGE.NETWORK_IDX));
     return networkIdxStore === String(endpointKey.ASTAR_ZKEVM)
       ? EthBridgeNetworkName.AstarZk
-      : EthBridgeNetworkName.Zkatana;
+      : EthBridgeNetworkName.Zkyoto;
   });
 
   const histories = ref<BridgeHistory[]>([]);
diff --git a/src/hooks/helper/wallet.ts b/src/hooks/helper/wallet.ts
index 64b79fe50..e89c3e569 100644
--- a/src/hooks/helper/wallet.ts
+++ b/src/hooks/helper/wallet.ts
@@ -287,7 +287,7 @@ const initWcProvider = async (): Promise<typeof WcEthereumProvider> => {
   const astar = providerEndpoints[endpointKey.ASTAR];
   const shiden = providerEndpoints[endpointKey.SHIDEN];
   const shibuya = providerEndpoints[endpointKey.SHIBUYA];
-  const zKatana = providerEndpoints[endpointKey.ZKATANA];
+  const zKyoto = providerEndpoints[endpointKey.ZKYOTO];
   const astarZkEvm = providerEndpoints[endpointKey.ASTAR_ZKEVM];
 
   // Memo: this can be committed as it can be exposed on the browser anyway
@@ -310,7 +310,7 @@ const initWcProvider = async (): Promise<typeof WcEthereumProvider> => {
       Number(shiden.evmChainId),
       Number(shibuya.evmChainId),
       // Number(astarZkEvm.evmChainId),
-      Number(zKatana.evmChainId),
+      Number(zKyoto.evmChainId),
       EVM.SEPOLIA_TESTNET,
     ],
     chains: [EVM.ETHEREUM_MAINNET],
@@ -319,7 +319,7 @@ const initWcProvider = async (): Promise<typeof WcEthereumProvider> => {
       [shiden.evmChainId]: shiden.evmEndpoints[0],
       [shibuya.evmChainId]: shibuya.evmEndpoints[0],
       // [astarZkEvm.evmChainId]: astarZkEvm.evmEndpoints[0],
-      [zKatana.evmChainId]: zKatana.evmEndpoints[0],
+      [zKyoto.evmChainId]: zKyoto.evmEndpoints[0],
       [String(EVM.SEPOLIA_TESTNET)]: String(rpcUrls[EVM.SEPOLIA_TESTNET][0]),
     },
   })) as any;
diff --git a/src/hooks/useNetworkInfo.ts b/src/hooks/useNetworkInfo.ts
index 84b9ca6c2..4ee7efdf9 100644
--- a/src/hooks/useNetworkInfo.ts
+++ b/src/hooks/useNetworkInfo.ts
@@ -8,7 +8,7 @@ import {
 import { endpointKey, getProviderIndex, providerEndpoints } from 'src/config/chainEndpoints';
 import { polkadotJsUrl } from 'src/links';
 import { useStore } from 'src/store';
-import { computed, watchEffect } from 'vue';
+import { computed } from 'vue';
 
 export function isCustomNetwork(network: string) {
   return network === 'custom-network';
@@ -26,11 +26,11 @@ export function useNetworkInfo() {
 
   const isZkEvm = computed<boolean>(
     () =>
-      currentNetworkIdx.value === endpointKey.ZKATANA ||
+      currentNetworkIdx.value === endpointKey.ZKYOTO ||
       currentNetworkIdx.value === endpointKey.ASTAR_ZKEVM
   );
 
-  const isZkatana = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ZKATANA);
+  const isZkyoto = computed<boolean>(() => currentNetworkIdx.value === endpointKey.ZKYOTO);
 
   const currentNetworkChain = computed<ASTAR_CHAIN>(() => {
     if (isZkEvm.value) {
@@ -43,7 +43,7 @@ export function useNetworkInfo() {
 
   const currentNetworkIdx = computed<ASTAR_NETWORK_IDX>(() => {
     const networkIdx = store.getters['general/networkIdx'];
-    if (networkIdx === endpointKey.ZKATANA || networkIdx === endpointKey.ASTAR_ZKEVM) {
+    if (networkIdx === endpointKey.ZKYOTO || networkIdx === endpointKey.ASTAR_ZKEVM) {
       return networkIdx;
     }
     const chainInfo = store.getters['general/chainInfo'];
@@ -106,6 +106,6 @@ export function useNetworkInfo() {
     polkadotJsLink,
     isZkEvm,
     networkNameSubstrate,
-    isZkatana,
+    isZkyoto,
   };
 }
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index a30b193dd..87f60958a 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -957,7 +957,7 @@ export default {
       title: 'Ethereum Bridge',
       text: 'Bridge assets between {l1} and {l2}',
       text2:
-        'Available on testnet! - To experience, connect your wallet to Astar zKatana (zkEVM testnet) and get testnet ETH',
+        'Available on testnet! - To experience, connect your wallet to Astar zKyoto (zkEVM testnet) and get testnet ETH',
       lean: '(learn more)',
     },
     astarBridge: {
diff --git a/src/i18n/es/index.ts b/src/i18n/es/index.ts
index 350ed2165..49bf524f5 100644
--- a/src/i18n/es/index.ts
+++ b/src/i18n/es/index.ts
@@ -700,7 +700,7 @@ export default {
       title: 'Puente de Ethereum',
       text: 'Puente de activos entre {l1} y {l2}',
       text2:
-        '¡Disponible en testnet! - Para experimentar, conecte su cartera a Astar zKatana (zkEVM testnet) y obtenga ETH en testnet',
+        '¡Disponible en testnet! - Para experimentar, conecte su cartera a Astar zKyoto (zkEVM testnet) y obtenga ETH en testnet',
       lean: '(aprenda más)',
     },
     astarBridge: {
diff --git a/src/i18n/fr/index.ts b/src/i18n/fr/index.ts
index c073756ad..599e2062d 100644
--- a/src/i18n/fr/index.ts
+++ b/src/i18n/fr/index.ts
@@ -707,7 +707,7 @@ export default {
       title: 'Bridge Ethereum',
       text: 'Bridger les actifs entre {l1} et {l2}',
       text2:
-        "Disponible sur le testnet! - Pour en faire l'expérience, connectez votre portefeuille à Astar zKatana (zkEVM testnet) et obtenez des ETH sur le testnet",
+        "Disponible sur le testnet! - Pour en faire l'expérience, connectez votre portefeuille à Astar zKyoto (zkEVM testnet) et obtenez des ETH sur le testnet",
       lean: '(En apprendre plus)',
     },
     astarBridge: {
diff --git a/src/i18n/ja/index.ts b/src/i18n/ja/index.ts
index 19289a5d2..2e7571273 100644
--- a/src/i18n/ja/index.ts
+++ b/src/i18n/ja/index.ts
@@ -706,7 +706,7 @@ export default {
       title: 'Ethereum ブリッジ',
       text: ' {l1} と {l2} のブリッジとなる資産',
       text2:
-        'テストネットで利用可能！- 体験するには、あなたのウォレットをAstar zKatana (zkEVM testnet)に接続し、testnet ETHを取得してください。',
+        'テストネットで利用可能！- 体験するには、あなたのウォレットをAstar zKyoto (zkEVM testnet)に接続し、testnet ETHを取得してください。',
       lean: '(もっと学ぶ)',
     },
     astarBridge: {
diff --git a/src/i18n/pt/index.ts b/src/i18n/pt/index.ts
index e9b478373..8fec15c20 100644
--- a/src/i18n/pt/index.ts
+++ b/src/i18n/pt/index.ts
@@ -684,7 +684,7 @@ export default {
       title: 'Ponte Ethereum',
       text: 'Ponte de ativos entre {l1} e {l2}',
       text2:
-        'Disponível na testnet! - Para experimentar, conecte sua carteira ao Astar zKatana (zkEVM testnet) e obtenha testnet ETH',
+        'Disponível na testnet! - Para experimentar, conecte sua carteira ao Astar zKyoto (zkEVM testnet) e obtenha testnet ETH',
       lean: '(saiba mais)',
     },
     astarBridge: {
diff --git a/src/modules/xcm/index.ts b/src/modules/xcm/index.ts
index 8a6a12a27..ce75ac8ed 100644
--- a/src/modules/xcm/index.ts
+++ b/src/modules/xcm/index.ts
@@ -383,5 +383,5 @@ export const restrictedXcmNetwork = {
   [astarChain.DEVELOPMENT]: [],
   [astarChain.ROCSTAR]: [],
   [astarChain.ASTAR_ZKEVM]: [],
-  [astarChain.ZKATANA]: [],
+  [astarChain.ZKYOTO]: [],
 };
diff --git a/src/modules/xcm/tokens/index.ts b/src/modules/xcm/tokens/index.ts
index 6b05d4bf7..7e0673cb0 100644
--- a/src/modules/xcm/tokens/index.ts
+++ b/src/modules/xcm/tokens/index.ts
@@ -282,7 +282,7 @@ export const xcmToken = {
   [endpointKey.CUSTOM]: [],
   [endpointKey.ROCSTAR]: [],
   [endpointKey.ASTAR_ZKEVM]: [],
-  [endpointKey.ZKATANA]: [],
+  [endpointKey.ZKYOTO]: [],
 };
 
 // Memo: placeholder for assetId of ASTR/SDN/SBY
diff --git a/src/modules/zk-evm-bridge/l1-bridge/index.ts b/src/modules/zk-evm-bridge/l1-bridge/index.ts
index 86ccf954a..5f9fb04ba 100644
--- a/src/modules/zk-evm-bridge/l1-bridge/index.ts
+++ b/src/modules/zk-evm-bridge/l1-bridge/index.ts
@@ -5,13 +5,13 @@ export const ZK_EVM_BRIDGE_ABI = ABI_ZK_EVM_BRIDGE;
 
 // Todo: update to https
 export const zkEvmApi = {
-  testnet: 'https://bridge-api.zkatana.gelato.digital',
+  testnet: 'https://bridge-api.zkyoto.gelato.digital',
   mainnet: 'https://akiba-bridge-api.astar.network',
 };
 
 export enum EthBridgeNetworkName {
   'Sepolia' = 'Sepolia Testnet',
-  'Zkatana' = 'zKatana Testnet',
+  'Zkyoto' = 'zKyoto Testnet',
   'Ethereum' = 'Ethereum',
   'AstarZk' = 'Astar zkEVM',
 }
@@ -19,37 +19,37 @@ export enum EthBridgeNetworkName {
 // Memo: do not import from src/config/web3 due to reference conflicts
 export enum ZkChainId {
   'Sepolia' = 11155111,
-  'Zkatana' = 1261120,
+  'Zkyoto' = 6038361,
   'Ethereum' = 1,
   'AstarZk' = 9999999, // Todo: update
 }
 
 // Todo: check mainnet contract
 export const EthBridgeContract = {
-  [EthBridgeNetworkName.Sepolia]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
-  [EthBridgeNetworkName.Ethereum]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
-  [EthBridgeNetworkName.Zkatana]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
-  [EthBridgeNetworkName.AstarZk]: '0xA34BBAf52eE84Cd95a6d5Ac2Eab9de142D4cdB53',
+  [EthBridgeNetworkName.Sepolia]: '0x46d13b853f1B4cf7FEa9fDb335445A197Ef7374D',
+  [EthBridgeNetworkName.Ethereum]: '0x46d13b853f1B4cf7FEa9fDb335445A197Ef7374D',
+  [EthBridgeNetworkName.Zkyoto]: '0x46d13b853f1B4cf7FEa9fDb335445A197Ef7374D',
+  [EthBridgeNetworkName.AstarZk]: '0x46d13b853f1B4cf7FEa9fDb335445A197Ef7374D',
 };
 
 export const EthBridgeChainId = {
   [EthBridgeNetworkName.Sepolia]: ZkChainId.Sepolia,
   [EthBridgeNetworkName.Ethereum]: ZkChainId.Ethereum,
-  [EthBridgeNetworkName.Zkatana]: ZkChainId.Zkatana,
+  [EthBridgeNetworkName.Zkyoto]: ZkChainId.Zkyoto,
   [EthBridgeNetworkName.AstarZk]: ZkChainId.AstarZk,
 };
 
 export const EthBridgeChainIdToName = {
   [ZkChainId.Sepolia]: EthBridgeNetworkName.Sepolia,
   [ZkChainId.Ethereum]: EthBridgeNetworkName.Ethereum,
-  [ZkChainId.Zkatana]: EthBridgeNetworkName.Zkatana,
+  [ZkChainId.Zkyoto]: EthBridgeNetworkName.Zkyoto,
   [ZkChainId.AstarZk]: EthBridgeNetworkName.AstarZk, // Todo: update
 };
 
 export const zkBridgeIcon = {
   [EthBridgeNetworkName.Sepolia]: require('/src/assets/img/ethereum.png'),
   [EthBridgeNetworkName.Ethereum]: require('/src/assets/img/ethereum.png'),
-  [EthBridgeNetworkName.Zkatana]: require('src/assets/img/chain/zkatana-logo.png'),
+  [EthBridgeNetworkName.Zkyoto]: require('src/assets/img/chain/zkatana-logo.png'),
   [EthBridgeNetworkName.AstarZk]: require('src/assets/img/chain/zkatana-logo.png'),
 } as any;
 
@@ -67,6 +67,7 @@ export interface BridgeHistory {
   claim_tx_hash: string;
   metadata: string;
   ready_for_claim: boolean;
+  global_index: string;
   timestamp?: number;
   isActionRequired?: boolean;
   symbol?: string;
diff --git a/src/modules/zk-evm-bridge/l1-bridge/utils.ts b/src/modules/zk-evm-bridge/l1-bridge/utils.ts
index 7d7623970..da9f05ca9 100644
--- a/src/modules/zk-evm-bridge/l1-bridge/utils.ts
+++ b/src/modules/zk-evm-bridge/l1-bridge/utils.ts
@@ -21,6 +21,7 @@ import { astarNativeTokenErcAddr } from 'src/modules/xcm';
 type MerkleProof = {
   main_exit_root: string;
   merkle_proof: string[];
+  rollup_merkle_proof: string[];
   rollup_exit_root: string;
 };
 
@@ -42,7 +43,7 @@ export const getContractFromNetId = (zkNetwork: ZkNetworkId): string => {
   } else {
     return zkNetwork === ZkNetworkId.L1
       ? EthBridgeContract[EthBridgeNetworkName.Sepolia]
-      : EthBridgeContract[EthBridgeNetworkName.Zkatana];
+      : EthBridgeContract[EthBridgeNetworkName.Zkyoto];
   }
 };
 
@@ -55,7 +56,7 @@ export const getChainIdFromNetId = (zkNetwork: ZkNetworkId): ZkChainId => {
   } else {
     return zkNetwork === ZkNetworkId.L1
       ? EthBridgeChainId[EthBridgeNetworkName.Sepolia]
-      : EthBridgeChainId[EthBridgeNetworkName.Zkatana];
+      : EthBridgeChainId[EthBridgeNetworkName.Zkyoto];
   }
 };
 
diff --git a/src/v2/repositories/implementations/EvmAssetsRepository.ts b/src/v2/repositories/implementations/EvmAssetsRepository.ts
index a0d5850d5..dc5164672 100644
--- a/src/v2/repositories/implementations/EvmAssetsRepository.ts
+++ b/src/v2/repositories/implementations/EvmAssetsRepository.ts
@@ -61,7 +61,7 @@ export class EvmAssetsRepository implements IEvmAssetsRepository {
       String(srcChainId) === providerEndpoints[endpointKey.SHIBUYA].evmChainId ||
       String(srcChainId) === providerEndpoints[endpointKey.ROCSTAR].evmChainId ||
       String(srcChainId) === providerEndpoints[endpointKey.ASTAR_ZKEVM].evmChainId ||
-      String(srcChainId) === providerEndpoints[endpointKey.ZKATANA].evmChainId ||
+      String(srcChainId) === providerEndpoints[endpointKey.ZKYOTO].evmChainId ||
       String(srcChainId) === providerEndpoints[endpointKey.LOCAL].evmChainId
     ) {
       return [];
diff --git a/src/v2/repositories/implementations/ZkBridgeRepository.ts b/src/v2/repositories/implementations/ZkBridgeRepository.ts
index b720e3281..262882f0b 100644
--- a/src/v2/repositories/implementations/ZkBridgeRepository.ts
+++ b/src/v2/repositories/implementations/ZkBridgeRepository.ts
@@ -90,12 +90,19 @@ export class ZkBridgeRepository implements IZkBridgeRepository {
     param: ParamClaim;
     web3: Web3;
   }): Promise<TransactionConfig> {
-    const { deposit_cnt, orig_net, orig_addr, dest_net, dest_addr, amount, metadata, network_id } =
-      param.withdrawal;
-    const { main_exit_root, merkle_proof, rollup_exit_root } = await fetchMerkleProof(
+    const {
       deposit_cnt,
-      Number(network_id)
-    );
+      orig_net,
+      orig_addr,
+      dest_net,
+      dest_addr,
+      amount,
+      metadata,
+      network_id,
+      global_index,
+    } = param.withdrawal;
+    const { main_exit_root, merkle_proof, rollup_exit_root, rollup_merkle_proof } =
+      await fetchMerkleProof(deposit_cnt, Number(network_id));
 
     const contractAddress = getContractFromNetId(network_id);
     const contract = new web3.eth.Contract(ZK_EVM_BRIDGE_ABI as AbiItem[], contractAddress);
@@ -103,7 +110,8 @@ export class ZkBridgeRepository implements IZkBridgeRepository {
     const data = contract.methods
       .claimAsset(
         merkle_proof,
-        Number(deposit_cnt),
+        rollup_merkle_proof,
+        Number(global_index),
         main_exit_root,
         rollup_exit_root,
         orig_net,