diff --git a/deploy/2-configure-feeds.ts b/deploy/2-configure-feeds.ts
index 21c9af90..60c82d83 100644
--- a/deploy/2-configure-feeds.ts
+++ b/deploy/2-configure-feeds.ts
@@ -10,8 +10,6 @@ const func: DeployFunction = async function ({ network, deployments, getNamedAcc
   const { deployer } = await getNamedAccounts();
 
   const resilientOracle = await hre.ethers.getContract("ResilientOracle");
-  const binanceOracle = await hre.ethers.getContract("BinanceOracle");
-  const chainlinkOracle = await hre.ethers.getContract("ChainlinkOracle");
 
   const oraclesData: Oracles = await getOraclesData();
 
@@ -19,69 +17,32 @@ const func: DeployFunction = async function ({ network, deployments, getNamedAcc
     const { oracle } = asset;
     console.log(`Configuring ${asset.token}`);
 
-    if (network.live) {
-      console.log(`Configuring ${oracle} oracle for ${asset.token}`);
-
-      const { getTokenConfig, getDirectPriceConfig } = oraclesData[oracle];
-
-      if (
-        oraclesData[oracle].underlyingOracle.address === chainlinkOracle.address &&
-        getDirectPriceConfig !== undefined
-      ) {
-        const assetConfig: any = getDirectPriceConfig(asset);
-        const tx = await oraclesData[oracle].underlyingOracle?.setDirectPrice(assetConfig.asset, assetConfig.price);
-        tx.wait(1);
-      }
-
-      if (oraclesData[oracle].underlyingOracle.address !== binanceOracle.address && getTokenConfig !== undefined) {
-        const tx = await oraclesData[oracle].underlyingOracle?.setTokenConfig(getTokenConfig(asset, networkName));
-        tx.wait(1);
-      }
-
-      const { getStalePeriodConfig } = oraclesData[oracle];
-      if (
-        oraclesData[oracle].underlyingOracle.address === binanceOracle.address &&
-        getStalePeriodConfig !== undefined
-      ) {
-        const tx = await oraclesData[oracle].underlyingOracle?.setTokenConfig(...getStalePeriodConfig(asset));
-        tx.wait(1);
-      }
-
-      console.log(`Configuring resillient oracle for ${asset.token}`);
-      const tx = await resilientOracle.setTokenConfig({
-        asset: asset.address,
-        oracles: oraclesData[oracle].oracles,
-        enableFlagsForOracles: oraclesData[oracle].enableFlagsForOracles,
-      });
-
-      await tx.wait(1);
-    } else {
-      await deploy(`Mock${asset.token}`, {
-        from: deployer,
-        log: true,
-        deterministicDeployment: false,
-        args: [`Mock${asset.token}`, `Mock${asset.token}`, 18],
-        autoMine: true,
-        contract: "BEP20Harness",
-      });
-
-      const mock = await hre.ethers.getContract(`Mock${asset.token}`);
-
-      console.log(`Configuring resillient oracle for ${asset.token}`);
-      let tx = await resilientOracle.setTokenConfig({
-        asset: mock.address,
-        oracles: oraclesData[oracle].oracles,
-        enableFlagsForOracles: oraclesData[oracle].enableFlagsForOracles,
-      });
-
-      await tx.wait(1);
-
-      console.log(`Configuring ${oracle} oracle for ${asset.token}`);
-      tx = await oraclesData[oracle].underlyingOracle?.setPrice(mock.address, asset.price);
-      await tx.wait(1);
-    }
+    await deploy(`Mock${asset.token}`, {
+      from: deployer,
+      log: true,
+      deterministicDeployment: false,
+      args: [`Mock${asset.token}`, `Mock${asset.token}`, 18],
+      autoMine: true,
+      contract: "BEP20Harness",
+    });
+
+    const mock = await hre.ethers.getContract(`Mock${asset.token}`);
+
+    console.log(`Configuring resillient oracle for ${asset.token}`);
+    let tx = await resilientOracle.setTokenConfig({
+      asset: mock.address,
+      oracles: oraclesData[oracle].oracles,
+      enableFlagsForOracles: oraclesData[oracle].enableFlagsForOracles,
+    });
+
+    await tx.wait(1);
+
+    console.log(`Configuring ${oracle} oracle for ${asset.token}`);
+    tx = await oraclesData[oracle].underlyingOracle?.setPrice(mock.address, asset.price);
+    await tx.wait(1);
   }
 };
 
 export default func;
 func.tags = ["configure"];
+func.skip = async hre => hre.network.live;
diff --git a/deploy/3-vip-based-configuration.ts b/deploy/3-vip-based-configuration.ts
index f93c127c..5399017f 100644
--- a/deploy/3-vip-based-configuration.ts
+++ b/deploy/3-vip-based-configuration.ts
@@ -31,9 +31,8 @@ const configurePriceFeeds = async (hre: HardhatRuntimeEnvironment): Promise<Gove
 
   for (const asset of assets[networkName]) {
     const { oracle } = asset;
-    console.log(`Configuring ${asset.token}`);
-
-    console.log(`Configuring ${oracle} oracle for ${asset.token}`);
+    console.log(`Adding commands for configuring ${asset.token}`);
+    console.log(`Adding a command to configure ${oracle} oracle for ${asset.token}`);
 
     const { getTokenConfig, getDirectPriceConfig } = oraclesData[oracle];
 
@@ -72,8 +71,8 @@ const configurePriceFeeds = async (hre: HardhatRuntimeEnvironment): Promise<Gove
       });
     }
 
-    console.log(`Configuring resillient oracle for ${asset.token}`);
-
+    console.log(``);
+    console.log(`Adding a command to configure resillient oracle for ${asset.token}`);
     commands.push({
       contract: resilientOracle.address,
       signature: "setTokenConfig((address,address[3],bool[3]))",