diff --git a/.prettierignore b/.prettierignore
index eb50ac5..da5fa0f 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,5 +3,4 @@ artifacts
 cache
 assets
 coverage
-contracts/constants
 contracts/vendor
\ No newline at end of file
diff --git a/contracts/constants/CDebtBridge.sol b/contracts/constants/CDebtBridge.sol
index 2e4994b..4cf271a 100644
--- a/contracts/constants/CDebtBridge.sol
+++ b/contracts/constants/CDebtBridge.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.7.4;
 
-function GAS_COSTS_FOR_FULL_REFINANCE() pure returns(uint256[4] memory) {
+function GAS_COSTS_FOR_FULL_REFINANCE() pure returns (uint256[4] memory) {
     return [uint256(2519000), 3140500, 3971000, 4345000];
-}
\ No newline at end of file
+}
diff --git a/contracts/constants/CInstaDapp.sol b/contracts/constants/CInstaDapp.sol
index 88a677b..cccf10c 100644
--- a/contracts/constants/CInstaDapp.sol
+++ b/contracts/constants/CInstaDapp.sol
@@ -15,4 +15,4 @@ address constant DAI = 0x6B175474E89094C44Da98b954EedeAC495271d0F;
 
 // Insta Pool
 address constant INSTA_POOL_RESOLVER = 0xa004a5afBa04b74037E9E52bA1f7eb02b5E61509;
-uint256 constant ROUTE_1_TOLERANCE = 1005e15;
\ No newline at end of file
+uint256 constant ROUTE_1_TOLERANCE = 1005e15;
diff --git a/contracts/constants/CMaker.sol b/contracts/constants/CMaker.sol
index 8ebef7b..021f45a 100644
--- a/contracts/constants/CMaker.sol
+++ b/contracts/constants/CMaker.sol
@@ -1,4 +1,4 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity 0.7.4;
 
-address constant MCD_MANAGER = 0x5ef30b9986345249bc32d8928B7ee64DE9435E39;
\ No newline at end of file
+address constant MCD_MANAGER = 0x5ef30b9986345249bc32d8928B7ee64DE9435E39;
diff --git a/deploy/connectors/ConnectGelatoDataForFullRefinance.deploy.js b/deploy/connectors/ConnectGelatoDataForFullRefinance.deploy.js
index 4a141ab..df2d818 100644
--- a/deploy/connectors/ConnectGelatoDataForFullRefinance.deploy.js
+++ b/deploy/connectors/ConnectGelatoDataForFullRefinance.deploy.js
@@ -10,7 +10,8 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConnectGelatoDataFullRefinanceMaker to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/connectors/ConnectGelatoDataForPartialRefinance.deploy.js b/deploy/connectors/ConnectGelatoDataForPartialRefinance.deploy.js
index d8a4921..66908df 100644
--- a/deploy/connectors/ConnectGelatoDataForPartialRefinance.deploy.js
+++ b/deploy/connectors/ConnectGelatoDataForPartialRefinance.deploy.js
@@ -10,7 +10,8 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConnectGelatoDataPartialRefinanceMaker to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/connectors/ConnectGelatoProviderPayment.deploy.js b/deploy/connectors/ConnectGelatoProviderPayment.deploy.js
index aea1915..4065bd0 100644
--- a/deploy/connectors/ConnectGelatoProviderPayment.deploy.js
+++ b/deploy/connectors/ConnectGelatoProviderPayment.deploy.js
@@ -10,7 +10,8 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConnectGelatoProviderPayment to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    console.log("❗ CONNECTOR DEPLOYMENT: VERIFY & HARDCODE CONNECTOR ID");
+    await sleep(6000);
   }
   const { deployments } = hre;
   const { deploy } = deployments;
diff --git a/deploy/gelato/conditions/ConditionCompareUintsFromTwoSources.deploy.js b/deploy/gelato/conditions/ConditionCompareUintsFromTwoSources.deploy.js
index 6e6d9d0..bcaf00e 100644
--- a/deploy/gelato/conditions/ConditionCompareUintsFromTwoSources.deploy.js
+++ b/deploy/gelato/conditions/ConditionCompareUintsFromTwoSources.deploy.js
@@ -5,7 +5,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConditionCompareUintsFromTwoSources to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/gelato/conditions/ConditionDebtBridgeIsAffordable.deploy.js b/deploy/gelato/conditions/ConditionDebtBridgeIsAffordable.deploy.js
index 4cfaa6d..73ace9d 100644
--- a/deploy/gelato/conditions/ConditionDebtBridgeIsAffordable.deploy.js
+++ b/deploy/gelato/conditions/ConditionDebtBridgeIsAffordable.deploy.js
@@ -5,7 +5,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConditionDebtBridgeIsAffordable to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/gelato/conditions/ConditionMakerVaultUnsafe.deploy.js b/deploy/gelato/conditions/ConditionMakerVaultUnsafe.deploy.js
index 2be7408..e0289ad 100644
--- a/deploy/gelato/conditions/ConditionMakerVaultUnsafe.deploy.js
+++ b/deploy/gelato/conditions/ConditionMakerVaultUnsafe.deploy.js
@@ -5,7 +5,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying ConditionMakerVaultUnsafe to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/mocks/FGelatoDebtBridgeMock.deploy.js b/deploy/mocks/FGelatoDebtBridgeMock.deploy.js
index 531fc48..02c810e 100644
--- a/deploy/mocks/FGelatoDebtBridgeMock.deploy.js
+++ b/deploy/mocks/FGelatoDebtBridgeMock.deploy.js
@@ -5,7 +5,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying FGelatoDebtBridgeMock to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/mocks/FGelatoDebtBridgeMock.js b/deploy/mocks/FGelatoDebtBridgeMock.js
index 531fc48..02c810e 100644
--- a/deploy/mocks/FGelatoDebtBridgeMock.js
+++ b/deploy/mocks/FGelatoDebtBridgeMock.js
@@ -5,7 +5,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying FGelatoDebtBridgeMock to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/mocks/MockCDAI.deploy.js b/deploy/mocks/MockCDAI.deploy.js
index 74ae29d..96e4d6e 100644
--- a/deploy/mocks/MockCDAI.deploy.js
+++ b/deploy/mocks/MockCDAI.deploy.js
@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log("Deploying MockCDAI to mainnet. Hit ctrl + c to abort");
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/mocks/MockDSR.deploy.js b/deploy/mocks/MockDSR.deploy.js
index b933487..75577c9 100644
--- a/deploy/mocks/MockDSR.deploy.js
+++ b/deploy/mocks/MockDSR.deploy.js
@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log("Deploying MockDSR to mainnet. Hit ctrl + c to abort");
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/mocks/MockGelatoExecutor.deploy.js b/deploy/mocks/MockGelatoExecutor.deploy.js
index cfa79dc..cd94b4f 100644
--- a/deploy/mocks/MockGelatoExecutor.deploy.js
+++ b/deploy/mocks/MockGelatoExecutor.deploy.js
@@ -8,7 +8,7 @@ module.exports = async (hre) => {
     console.log(
       "Deploying MockGelatoExecutor to mainnet. Hit ctrl + c to abort"
     );
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;
diff --git a/deploy/resolvers/MakerResolver.deploy.js b/deploy/resolvers/MakerResolver.deploy.js
index ea1a042..d91943f 100644
--- a/deploy/resolvers/MakerResolver.deploy.js
+++ b/deploy/resolvers/MakerResolver.deploy.js
@@ -3,7 +3,7 @@ const { sleep } = require("@gelatonetwork/core");
 module.exports = async (hre) => {
   if (hre.network.name === "mainnet") {
     console.log("Deploying MakerResolver to mainnet. Hit ctrl + c to abort");
-    await sleep(2000);
+    await sleep(6000);
   }
 
   const { deployments } = hre;