diff --git a/.env.sample b/.env.sample
index 35513319..2184ba61 100755
--- a/.env.sample
+++ b/.env.sample
@@ -1,3 +1,3 @@
-ETHERSCAN_API_KEY = "etherscan_api_key"
+BLOCK_EXPLORER_API_KEY = "block_explorer_api_key"
 WALLET_PRIVATE_KEY = "wallet_private_key"
 REPORT_GAS=true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b40ced17..4759fca6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,8 +5,11 @@ on:
     inputs:
       network:
         description: 'Network name for deployment'
-        required: false
-        default: 'truffle-dashboard'
+        required: true
+      block_explorer_api_key:
+        description: 'Block explorer API key (use default value for Blockscout)'
+        required: true
+        default: 'no'
 
 jobs:
   deploy:
@@ -28,21 +31,35 @@ jobs:
 
       - name: Deploy Router
         run: npm run deploy:router -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Deploy SimpleCaller
         run: npm run deploy:sc -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Deploy UniswapV2Caller
         run: npm run deploy:univ2caller -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Deploy Safe Proxy
         run: npm run deploy:safe -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Deploy SimpleCallerWithPermit2
         run: npm run deploy:scwp2 -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Initialize Router
         run: npm run initialize:router -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }}
+        env:
+          WALLET_PRIVATE_KEY: ${{ secrets.WALLET_PRIVATE_KEY }}
 
       - name: Verify Contracts
         run: npm run verify -- --network ${{ github.event.inputs.network || 'truffle-dashboard' }} 
+        env:
+          BLOCK_EXPLORER_API_KEY: ${{ github.event.inputs.block_explorer_api_key }}
diff --git a/hardhat.config.ts b/hardhat.config.ts
index de659bc3..07ed7ae9 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -181,33 +181,33 @@ const config: HardhatUserConfig = {
   },
   etherscan: {
     apiKey: {
-      abstract: process.env.ABSTRACT_API_KEY ? process.env.ABSTRACT_API_KEY.toString() : '',
-      arbitrumOne: process.env.ARBITRUM_API_KEY ? process.env.ARBITRUM_API_KEY.toString() : '',
-      aurora: 'no',
-      avalanche: process.env.AVALANCHE_API_KEY ? process.env.AVALANCHE_API_KEY.toString() : '',
-      base: process.env.BASE_API_KEY ? process.env.BASE_API_KEY.toString() : '',
-      berachain: process.env.BERACHAIN_API_KEY ? process.env.BERACHAIN_API_KEY.toString() : '',
-      blast: process.env.BLAST_API_KEY ? process.env.BLAST_API_KEY.toString() : '',
-      bsc: process.env.BSC_API_KEY ? process.env.BSC_API_KEY.toString() : '',
-      celo: process.env.CELO_API_KEY ? process.env.CELO_API_KEY.toString() : '',
-      xdai: process.env.GNOSIS_API_KEY ? process.env.GNOSIS_API_KEY.toString() : '',
-      ink: 'ink',
-      linea: process.env.LINEA_API_KEY ? process.env.LINEA_API_KEY.toString() : '',
-      mainnet: process.env.ETHEREUM_API_KEY ? process.env.ETHEREUM_API_KEY.toString() : '',
-      mantle: process.env.MANTLE_API_KEY ? process.env.MANTLE_API_KEY.toString() : '',
-      mode: 'mode',
-      opera: process.env.FANTOM_API_KEY ? process.env.FANTOM_API_KEY.toString() : '',
-      optimisticEthereum: process.env.OPTIMISM_API_KEY ? process.env.OPTIMISM_API_KEY.toString() : '',
-      polygon: process.env.POLYGON_API_KEY ? process.env.POLYGON_API_KEY.toString() : '',
-      'polygon-zkevm': process.env.POLYGON_ZKEVM_API_KEY ? process.env.POLYGON_ZKEVM_API_KEY.toString() : '',
-      scroll: process.env.SCROLL_API_KEY ? process.env.SCROLL_API_KEY.toString() : '',
-      soneium: 'soneium',
-      sonic: process.env.SONIC_API_KEY ? process.env.SONIC_API_KEY.toString() : '',
-      taiko: process.env.TAIKO_API_KEY ? process.env.TAIKO_API_KEY.toString() : '',
-      xlayer: process.env.XLAYER_API_KEY ? process.env.XLAYER_API_KEY.toString() : '',
-      unichain: 'unichain',
-      zora: 'zora',
-      zero: 'zero',
+      abstract: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      arbitrumOne: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      aurora: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      avalanche: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      base: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      berachain: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      blast: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      bsc: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      celo: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      xdai: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      ink: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      linea: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      mainnet: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      mantle: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      mode: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      opera: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      optimisticEthereum: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      polygon: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      'polygon-zkevm': process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      scroll: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      soneium: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      sonic: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      taiko: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      xlayer: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      unichain: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      zora: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
+      zero: process.env.BLOCK_EXPLORER_API_KEY ? process.env.BLOCK_EXPLORER_API_KEY.toString() : '',
     },
     customChains: [
       {