diff --git a/src/BalanceGuard.ts b/src/BalanceGuard.ts
index 2308313..9d0b881 100644
--- a/src/BalanceGuard.ts
+++ b/src/BalanceGuard.ts
@@ -1,7 +1,7 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
 import clone from 'just-clone';
-import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import { APPROVE_ERC20_GAS_LIMIT, NATIVE_CURRENCY_PRECISION } from './constants/index.js';
 import type {
   AggregatedBalanceRequirement, ApproveFix, Asset, BalanceIssue, BalanceRequirement, Source,
diff --git a/src/Orion/bridge/swap.ts b/src/Orion/bridge/swap.ts
index f527fbd..4bb8352 100644
--- a/src/Orion/bridge/swap.ts
+++ b/src/Orion/bridge/swap.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import getBalances from '../../utils/getBalances.js';
 import BalanceGuard from '../../BalanceGuard.js';
 import getAvailableSources from '../../utils/getAvailableFundsSources.js';
diff --git a/src/Unit/Exchange/callGenerators/aero.ts b/src/Unit/Exchange/callGenerators/aero.ts
index fc235fd..755c49a 100644
--- a/src/Unit/Exchange/callGenerators/aero.ts
+++ b/src/Unit/Exchange/callGenerators/aero.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory, AeroPool__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory, AeroPool__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import { type BigNumberish, JsonRpcProvider } from "ethers"
 import { SafeArray } from "../../../utils/safeGetters.js"
 import { addCallParams } from "./utils.js"
diff --git a/src/Unit/Exchange/callGenerators/curve.ts b/src/Unit/Exchange/callGenerators/curve.ts
index 596854e..6b9de2b 100644
--- a/src/Unit/Exchange/callGenerators/curve.ts
+++ b/src/Unit/Exchange/callGenerators/curve.ts
@@ -2,7 +2,7 @@ import {
   SwapExecutor__factory,
   CurveRegistry__factory,
   ERC20__factory,
-} from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js";
+} from "@orionprotocol/contracts/lib/ethers-v6/index.js";
 import { MaxUint256, type BigNumberish, type JsonRpcProvider } from "ethers";
 import { addCallParams, pathCallWithBalance } from "./utils.js";
 import type { SingleSwap } from "../../../types.js";
diff --git a/src/Unit/Exchange/callGenerators/erc20.ts b/src/Unit/Exchange/callGenerators/erc20.ts
index cc823d6..b32efce 100644
--- a/src/Unit/Exchange/callGenerators/erc20.ts
+++ b/src/Unit/Exchange/callGenerators/erc20.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import type { BigNumberish, AddressLike } from "ethers"
 import { type CallParams, addCallParams } from "./utils.js"
 
diff --git a/src/Unit/Exchange/callGenerators/feePayment.ts b/src/Unit/Exchange/callGenerators/feePayment.ts
index ccff002..a16f4b1 100644
--- a/src/Unit/Exchange/callGenerators/feePayment.ts
+++ b/src/Unit/Exchange/callGenerators/feePayment.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import type { BigNumberish, AddressLike } from "ethers"
 import { type CallParams, addCallParams } from "./utils.js"
 
diff --git a/src/Unit/Exchange/callGenerators/uniswapV2.ts b/src/Unit/Exchange/callGenerators/uniswapV2.ts
index 53d26b5..4fa1566 100644
--- a/src/Unit/Exchange/callGenerators/uniswapV2.ts
+++ b/src/Unit/Exchange/callGenerators/uniswapV2.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import { SafeArray } from "../../../utils/safeGetters.js"
 import { type BytesLike, type BigNumberish, concat, ethers, toBeHex } from "ethers"
 import { addCallParams } from "./utils.js"
diff --git a/src/Unit/Exchange/callGenerators/uniswapV3.ts b/src/Unit/Exchange/callGenerators/uniswapV3.ts
index 2da58f1..67bfcec 100644
--- a/src/Unit/Exchange/callGenerators/uniswapV3.ts
+++ b/src/Unit/Exchange/callGenerators/uniswapV3.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory, UniswapV3Pool__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory, UniswapV3Pool__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import { type BigNumberish , ethers, JsonRpcProvider } from "ethers"
 import { SafeArray } from "../../../utils/safeGetters.js"
 import { addCallParams } from "./utils.js"
diff --git a/src/Unit/Exchange/callGenerators/utils.ts b/src/Unit/Exchange/callGenerators/utils.ts
index bf0c812..b61dc4b 100644
--- a/src/Unit/Exchange/callGenerators/utils.ts
+++ b/src/Unit/Exchange/callGenerators/utils.ts
@@ -1,4 +1,4 @@
-import { ERC20__factory, SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { ERC20__factory, SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import type { AddressLike } from "ethers"
 import { type BytesLike, ethers, type BigNumberish } from "ethers"
 
diff --git a/src/Unit/Exchange/callGenerators/weth.ts b/src/Unit/Exchange/callGenerators/weth.ts
index 1e2b7e3..059e3c7 100644
--- a/src/Unit/Exchange/callGenerators/weth.ts
+++ b/src/Unit/Exchange/callGenerators/weth.ts
@@ -1,4 +1,4 @@
-import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js"
+import { SwapExecutor__factory } from "@orionprotocol/contracts/lib/ethers-v6/index.js"
 import type { BigNumberish } from "ethers"
 import { type CallParams, addCallParams } from "./utils.js"
 import type { AddressLike } from "ethers"
diff --git a/src/Unit/Exchange/deposit.ts b/src/Unit/Exchange/deposit.ts
index 93f4d71..d257244 100644
--- a/src/Unit/Exchange/deposit.ts
+++ b/src/Unit/Exchange/deposit.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import getBalances from '../../utils/getBalances.js';
 import BalanceGuard from '../../BalanceGuard.js';
 import type Unit from '../index.js';
diff --git a/src/Unit/Exchange/generateSwapCalldata.ts b/src/Unit/Exchange/generateSwapCalldata.ts
index 1b7b350..94d53d9 100644
--- a/src/Unit/Exchange/generateSwapCalldata.ts
+++ b/src/Unit/Exchange/generateSwapCalldata.ts
@@ -1,4 +1,4 @@
-import type { LibValidator } from '@orionprotocol/contracts/lib/ethers-v6-cjs/Exchange.js';
+import type { LibValidator } from '@orionprotocol/contracts/lib/ethers-v6/Exchange.js';
 import { ethers, ZeroAddress } from 'ethers';
 import type { AddressLike, JsonRpcProvider, BigNumberish, BytesLike } from 'ethers';
 import cloneDeep from 'lodash.clonedeep';
diff --git a/src/Unit/Exchange/swapLimit.ts b/src/Unit/Exchange/swapLimit.ts
index b2d4886..19ae300 100644
--- a/src/Unit/Exchange/swapLimit.ts
+++ b/src/Unit/Exchange/swapLimit.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import getBalances from '../../utils/getBalances.js';
 import BalanceGuard from '../../BalanceGuard.js';
 import getAvailableSources from '../../utils/getAvailableFundsSources.js';
diff --git a/src/Unit/Exchange/swapMarket.ts b/src/Unit/Exchange/swapMarket.ts
index 20a0d99..934e2bb 100644
--- a/src/Unit/Exchange/swapMarket.ts
+++ b/src/Unit/Exchange/swapMarket.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import getBalances from '../../utils/getBalances.js';
 import BalanceGuard from '../../BalanceGuard.js';
 import getAvailableSources from '../../utils/getAvailableFundsSources.js';
diff --git a/src/Unit/Exchange/withdraw.ts b/src/Unit/Exchange/withdraw.ts
index 7e400d7..9b5d2d7 100644
--- a/src/Unit/Exchange/withdraw.ts
+++ b/src/Unit/Exchange/withdraw.ts
@@ -1,6 +1,6 @@
 import { BigNumber } from 'bignumber.js';
 import { ethers } from 'ethers';
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import getBalances from '../../utils/getBalances.js';
 import BalanceGuard from '../../BalanceGuard.js';
 import type Unit from '../index.js';
diff --git a/src/Unit/Pmm/index.ts b/src/Unit/Pmm/index.ts
index 1c8b1f5..d4f1c57 100644
--- a/src/Unit/Pmm/index.ts
+++ b/src/Unit/Pmm/index.ts
@@ -4,7 +4,7 @@ import {pmmOrderSchema} from "./schemas/order";
 import {simpleFetch} from "simple-typed-fetch";
 import {ethers, Wallet} from "ethers";
 import {BigNumber} from "bignumber.js";
-import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import {orionRFQContractABI} from "./abi/OrionRFQ";
 
 export default class Pmm {
diff --git a/src/utils/checkIsToken.ts b/src/utils/checkIsToken.ts
index d55c45d..5be176a 100644
--- a/src/utils/checkIsToken.ts
+++ b/src/utils/checkIsToken.ts
@@ -1,4 +1,4 @@
-import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { ERC20__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import { ethers } from 'ethers';
 import invariant from 'tiny-invariant';
 
diff --git a/src/utils/getBalance.ts b/src/utils/getBalance.ts
index 10b3838..91ab443 100644
--- a/src/utils/getBalance.ts
+++ b/src/utils/getBalance.ts
@@ -1,4 +1,4 @@
-import { ERC20__factory, Exchange__factory, type Exchange } from "@orionprotocol/contracts/lib/ethers-v6-cjs/index.js";
+import { ERC20__factory, Exchange__factory, type Exchange } from "@orionprotocol/contracts/lib/ethers-v6/index.js";
 import type { BigNumber } from "bignumber.js";
 import { ZeroAddress, ethers } from "ethers";
 import { INTERNAL_PROTOCOL_PRECISION, NATIVE_CURRENCY_PRECISION } from "../constants/index.js";
diff --git a/src/utils/getBalances.ts b/src/utils/getBalances.ts
index 02527cc..f9e5390 100644
--- a/src/utils/getBalances.ts
+++ b/src/utils/getBalances.ts
@@ -1,4 +1,4 @@
-import type { Exchange } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import type { Exchange } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import type { BigNumber } from 'bignumber.js';
 import type { ethers } from 'ethers';
 import type { Aggregator } from '../services/Aggregator/index.js';
diff --git a/src/utils/parseExchangeTradeTransaction.ts b/src/utils/parseExchangeTradeTransaction.ts
index 7f63a85..9b59093 100644
--- a/src/utils/parseExchangeTradeTransaction.ts
+++ b/src/utils/parseExchangeTradeTransaction.ts
@@ -1,4 +1,4 @@
-import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6-cjs/index.js';
+import { Exchange__factory } from '@orionprotocol/contracts/lib/ethers-v6/index.js';
 import { ethers } from 'ethers';
 import { z } from 'zod';