diff --git a/deploy/001-xvs-bridge-local.ts b/deploy/001-xvs-bridge-local.ts
index 7dd7b66..97f6646 100644
--- a/deploy/001-xvs-bridge-local.ts
+++ b/deploy/001-xvs-bridge-local.ts
@@ -72,11 +72,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const accessControlManager = await ethers.getContract("AccessControlManager");
   const normalTimelock = await ethers.getContract("NormalTimelock");
   const resilientOracle = await ethers.getContract("ResilientOracle");
+  const XVS = await ethers.getContract("XVS");
 
   const XVSProxyOFTSrc = await deploy("XVSProxyOFTSrc", {
     from: deployer,
     contract: "XVSProxyOFTSrc",
-    args: [preconfiguredAddresses.XVS, 8, preconfiguredAddresses.LzEndpoint, resilientOracle.address],
+    args: [XVS.address, 8, preconfiguredAddresses.LzEndpoint, resilientOracle.address],
     autoMine: true,
     log: true,
   });
@@ -101,7 +102,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const bridge = await ethers.getContract("XVSProxyOFTSrc");
   const bridgeAdmin = await ethers.getContract("XVSBridgeAdmin");
 
-  const removeArray = new Array(xvsBridgeMethods.length).fill(false);
+  const removeArray = new Array(xvsBridgeMethods.length).fill(true);
   let tx = await bridgeAdmin.upsertSignature(xvsBridgeMethods, removeArray);
   await tx.wait();
 
diff --git a/deploy/002-xvs-bridge-remote.ts b/deploy/002-xvs-bridge-remote.ts
index fcd3cd0..f2d6f7d 100644
--- a/deploy/002-xvs-bridge-remote.ts
+++ b/deploy/002-xvs-bridge-remote.ts
@@ -88,6 +88,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const proxyOwnerAddress = await toAddress(preconfiguredAddresses.NormalTimelock, hre);
   const accessControlManager = await ethers.getContract("AccessControlManager");
+  const resilientOracle = await ethers.getContract("ResilientOracle");
 
   const XVS = await deploy("XVS", {
     from: deployer,
@@ -100,7 +101,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const XVSProxyOFTDest = await deploy("XVSProxyOFTDest", {
     from: deployer,
     contract: "XVSProxyOFTDest",
-    args: [XVS.address, 8, preconfiguredAddresses.LzEndpoint, preconfiguredAddresses.ResilientOracle],
+    args: [XVS.address, 8, preconfiguredAddresses.LzEndpoint, resilientOracle.address],
     autoMine: true,
     log: true,
   });
@@ -128,7 +129,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   await executeBridgeCommands(bridge, hre, deployer);
 
-  const removeArray = new Array(xvsBridgeMethods.length).fill(false);
+  const removeArray = new Array(xvsBridgeMethods.length).fill(true);
   let tx = await bridgeAdmin.upsertSignature(xvsBridgeMethods, removeArray);
   await tx.wait();