diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml
index f9c00e8..ce5815a 100644
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -189,7 +189,7 @@ services:
       REDIS_URI: redis://redis:${REDIS_PORT}
       USERNAME: admin
       PASSWORD: minabridge
-      QUEUES: UNLOCK_JOB_QUEUE,EVM_SENDER_QUEUE,MINA_SENDER_QUEUE,EVM_VALIDATOR_1,EVM_VALIDATOR_2,EVM_VALIDATOR_2,MINA_VALIDATOR_1,MINA_VALIDATOR_2,MINA_VALIDATOR_3
+      QUEUES: EVM_SENDER_QUEUE,MINA_SENDER_QUEUE,EVM_VALIDATOR_1,EVM_VALIDATOR_2,EVM_VALIDATOR_2,MINA_VALIDATOR_1,MINA_VALIDATOR_2,MINA_VALIDATOR_3
     ports:
       - '${BULL_MONITOR_PORT}:3011'
     depends_on:
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ed8367..1017c9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
       REDIS_URI: redis://redis:${REDIS_PORT}
       USERNAME: admin
       PASSWORD: minabridge
-      QUEUES: UNLOCK_JOB_QUEUE,EVM_SENDER_QUEUE,MINA_SENDER_QUEUE,EVM_VALIDATOR_1,EVM_VALIDATOR_2,EVM_VALIDATOR_2,MINA_VALIDATOR_1,MINA_VALIDATOR_2,MINA_VALIDATOR_3
+      QUEUES: EVM_SENDER_QUEUE,MINA_SENDER_QUEUE,EVM_VALIDATOR_1,EVM_VALIDATOR_2,EVM_VALIDATOR_2,MINA_VALIDATOR_1,MINA_VALIDATOR_2,MINA_VALIDATOR_3
     ports:
       - '${BULL_MONITOR_PORT}:3011'
     depends_on:
diff --git a/src/constants/entity.constant.ts b/src/constants/entity.constant.ts
index 35d69cd..4d54501 100644
--- a/src/constants/entity.constant.ts
+++ b/src/constants/entity.constant.ts
@@ -8,4 +8,4 @@ export enum ETableName {
   MULTI_SIGNATURE = 'multi_signature',
 }
 
-export const MINA_CRAWL_SAFE_BLOCK = 3;
+export const MINA_CRAWL_SAFE_BLOCK = 1;
diff --git a/src/modules/crawler/crawler.evmbridge.ts b/src/modules/crawler/crawler.evmbridge.ts
index bb8a13f..52610ab 100644
--- a/src/modules/crawler/crawler.evmbridge.ts
+++ b/src/modules/crawler/crawler.evmbridge.ts
@@ -90,7 +90,7 @@ export class BlockchainEVMCrawler {
       fromDecimal: fromTokenDecimal,
       toDecimal: toTokenDecimal,
       inputAmountNoDecimalPlaces: inputAmount,
-      gasFeeWithDecimalPlaces: this.configService.get(EEnvKey.GAS_FEE_EVM)!,
+      gasFeeWithDecimalPlaces: this.configService.get(EEnvKey.GASFEEMINA)!,
       tipPercent: +config!.tip,
     });
     if (error) {
diff --git a/src/modules/users/users.service.ts b/src/modules/users/users.service.ts
index cd8269b..e8f396c 100644
--- a/src/modules/users/users.service.ts
+++ b/src/modules/users/users.service.ts
@@ -81,11 +81,11 @@ export class UsersService {
       httpNotFound(EError.RESOURCE_NOT_FOUND);
     }
     if (tokenPair!.toChain == ENetworkName.MINA) {
-      decimal = this.configService.get(EEnvKey.DECIMAL_TOKEN_EVM);
-      gasFee = addDecimal(this.configService.get(EEnvKey.GAS_FEE_EVM)!, decimal);
-    } else {
       decimal = this.configService.get(EEnvKey.DECIMAL_TOKEN_MINA);
       gasFee = addDecimal(this.configService.get(EEnvKey.GASFEEMINA)!, decimal);
+    } else {
+      decimal = this.configService.get(EEnvKey.DECIMAL_TOKEN_EVM);
+      gasFee = addDecimal(this.configService.get(EEnvKey.GAS_FEE_EVM)!, decimal);
     }
 
     return { gasFee, tipRate: configTip!.tip, decimal };