diff --git a/hardhat.config.ts b/hardhat.config.ts
index 5b263e36..131f328e 100644
--- a/hardhat.config.ts
+++ b/hardhat.config.ts
@@ -30,7 +30,7 @@ import 'solidity-coverage';
 import { fork } from 'child_process';
 
 const SKIP_LOAD = process.env.SKIP_LOAD === 'true';
-const DEFAULT_BLOCK_GAS_LIMIT = 12450000;
+const DEFAULT_BLOCK_GAS_LIMIT = 8000000;
 const DEFAULT_GAS_MUL = 5;
 const HARDFORK = 'istanbul';
 const ETHERSCAN_KEY = process.env.ETHERSCAN_KEY || '';
diff --git a/helpers/init-helpers.ts b/helpers/init-helpers.ts
index 6f1de0ab..01e26bd8 100644
--- a/helpers/init-helpers.ts
+++ b/helpers/init-helpers.ts
@@ -270,9 +270,7 @@ export const configureReservesByHelper = async (
     console.log(`- Configure reserves in ${chunkedInputParams.length} txs`);
     for (let chunkIndex = 0; chunkIndex < chunkedInputParams.length; chunkIndex++) {
       await waitForTx(
-        await atokenAndRatesDeployer.configureReserves(chunkedInputParams[chunkIndex], {
-          gasLimit: 8000000, // TODO: Change this
-        })
+        await atokenAndRatesDeployer.configureReserves(chunkedInputParams[chunkIndex])
       );
       console.log(`  - Init for: ${chunkedSymbols[chunkIndex].join(', ')}`);
     }