diff --git a/bot/StateRelayerBot.ts b/bot/StateRelayerBot.ts
index c2647b2..7223735 100644
--- a/bot/StateRelayerBot.ts
+++ b/bot/StateRelayerBot.ts
@@ -39,6 +39,20 @@ export async function handler(props: StateRelayerHandlerProps): Promise<DFCData
     const dataMasterNode = transformDataMasternode(statsData);
 
     const nonce = await signer.getNonce();
+    const feeData = await signer.provider?.getFeeData();
+    const baseFeePerGas = (await signer.provider?.getBlock('latest'))?.baseFeePerGas || 10_000_000_000n;
+    let maxFeePerGas: bigint;
+    let maxPriorityFeePerGas: bigint;
+    if (feeData?.maxPriorityFeePerGas) {
+      maxFeePerGas =
+        feeData.maxFeePerGas ||
+        baseFeePerGas +
+          (feeData.maxPriorityFeePerGas >= 10_000_000_000n ? feeData.maxPriorityFeePerGas : 10_000_000_000n);
+      maxPriorityFeePerGas = feeData.maxPriorityFeePerGas;
+    } else {
+      maxFeePerGas = baseFeePerGas + 10_000_000_000n;
+      maxPriorityFeePerGas = 2_000_000_000n;
+    }
     // Call SC Function to update Data
     // Update Dex information
     const dexInfoTx = await stateRelayerContract.updateDEXInfo(
@@ -46,18 +60,27 @@ export async function handler(props: StateRelayerHandlerProps): Promise<DFCData
       inputForDexUpdate.dexInfo,
       inputForDexUpdate.totalValueLocked,
       inputForDexUpdate.total24HVolume,
-      { nonce: nonce, gasLimit: props.gasUpdateDEX },
+      {
+        nonce: nonce,
+        gasLimit: props.gasUpdateDEX,
+        maxFeePerGas: maxFeePerGas,
+        maxPriorityFeePerGas: maxPriorityFeePerGas,
+      },
     );
 
     // Update Master Node information
     const masterDataTx = await stateRelayerContract.updateMasterNodeInformation(dataMasterNode, {
       nonce: nonce + 1,
       gasLimit: props.gasUpdateMaster,
+      maxFeePerGas: maxFeePerGas,
+      maxPriorityFeePerGas: maxPriorityFeePerGas,
     });
     // Update Vault general information
     const vaultTx = await stateRelayerContract.updateVaultGeneralInformation(dataVault, {
       nonce: nonce + 2,
       gasLimit: props.gasUpdateVault,
+      maxFeePerGas: maxFeePerGas,
+      maxPriorityFeePerGas: maxPriorityFeePerGas,
     });
 
     console.log('Hash of dex update transaction', dexInfoTx.hash);
diff --git a/package-lock.json b/package-lock.json
index 20d92f6..01fff3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@waveshq/state-relayer-bot",
-  "version": "0.0.0-beta.5",
+  "version": "0.0.0-beta.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@waveshq/state-relayer-bot",
-      "version": "0.0.0-beta.5",
+      "version": "0.0.0-beta.6",
       "dependencies": {
         "@openzeppelin/contracts": "4.9.3",
         "@openzeppelin/contracts-upgradeable": "4.9.3",
diff --git a/package.json b/package.json
index 795cd36..e175f9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@waveshq/state-relayer-bot",
-  "version": "0.0.0-beta.5",
+  "version": "0.0.0-beta.6",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/tsconfig.json b/tsconfig.json
index 92e49bc..0efa7ba 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,9 @@
 {
   "extends": "@birthdayresearch/sticky-typescript",
   "compilerOptions": {
+    "lib": [
+      "es2020", "esnext"
+    ],
     "rootDir": "./"
   }
 }