diff --git a/remappings.txt b/remappings.txt
index 950f91b..cb91729 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -2,8 +2,7 @@ ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
 safe/=lib/safe/contracts/
 balancer/=lib/balancer/src/
-@openzeppelin/=lib/@openzeppelin/contracts/
-@openzeppelin/contracts/=lib/@openzeppelin/contracts/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
 canonical-weth/=lib/canonical-weth/src/
 cowprotocol/=lib/cowprotocol/src/contracts/
 murky/=lib/murky/src/
diff --git a/script/submit_SingleOrder.s.sol b/script/submit_SingleOrder.s.sol
index ccf5c1b..a0dae1f 100644
--- a/script/submit_SingleOrder.s.sol
+++ b/script/submit_SingleOrder.s.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import "forge-std/Script.sol";
 
-import {IERC20, IERC20Metadata} from "@openzeppelin/interfaces/IERC20Metadata.sol";
+import {IERC20, IERC20Metadata} from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
 
 // Safe contracts
 import {Safe} from "safe/Safe.sol";
diff --git a/src/types/GoodAfterTime.sol b/src/types/GoodAfterTime.sol
index 10aae9b..6c5d053 100644
--- a/src/types/GoodAfterTime.sol
+++ b/src/types/GoodAfterTime.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20} from "@openzeppelin/interfaces/IERC20.sol";
-import {SafeCast} from "@openzeppelin/utils/math/SafeCast.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 
 import "../vendored/Milkman.sol";
 import "../BaseConditionalOrder.sol";
diff --git a/src/types/PerpetualStableSwap.sol b/src/types/PerpetualStableSwap.sol
index 456d1bc..796fd76 100644
--- a/src/types/PerpetualStableSwap.sol
+++ b/src/types/PerpetualStableSwap.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20, IERC20Metadata} from "@openzeppelin/interfaces/IERC20Metadata.sol";
+import {IERC20, IERC20Metadata} from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
 
 import "../BaseConditionalOrder.sol";
 import {ConditionalOrdersUtilsLib as Utils} from "./ConditionalOrdersUtilsLib.sol";
diff --git a/src/types/StopLoss.sol b/src/types/StopLoss.sol
index c68cfaf..48465ef 100644
--- a/src/types/StopLoss.sol
+++ b/src/types/StopLoss.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20} from "@openzeppelin/interfaces/IERC20.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
 
 import "../BaseConditionalOrder.sol";
 import "../interfaces/IAggregatorV3Interface.sol";
diff --git a/src/types/TradeAboveThreshold.sol b/src/types/TradeAboveThreshold.sol
index 5ca6ca1..f1c2f0d 100644
--- a/src/types/TradeAboveThreshold.sol
+++ b/src/types/TradeAboveThreshold.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20} from "@openzeppelin/interfaces/IERC20.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
 
 import "../BaseConditionalOrder.sol";
 import {ConditionalOrdersUtilsLib as Utils} from "./ConditionalOrdersUtilsLib.sol";
diff --git a/src/types/twap/libraries/TWAPOrder.sol b/src/types/twap/libraries/TWAPOrder.sol
index 031ed83..9351680 100644
--- a/src/types/twap/libraries/TWAPOrder.sol
+++ b/src/types/twap/libraries/TWAPOrder.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20, IERC20Metadata} from "@openzeppelin/interfaces/IERC20Metadata.sol";
-import {SafeCast} from "@openzeppelin/utils/math/SafeCast.sol";
+import {IERC20, IERC20Metadata} from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import {GPv2Order} from "cowprotocol/libraries/GPv2Order.sol";
 
 import {IConditionalOrder} from "../../../interfaces/IConditionalOrder.sol";
diff --git a/src/vendored/Milkman.sol b/src/vendored/Milkman.sol
index 2401fa9..537a959 100644
--- a/src/vendored/Milkman.sol
+++ b/src/vendored/Milkman.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20} from "@openzeppelin/interfaces/IERC20.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
 
 interface IExpectedOutCalculator {
     function getExpectedOut(uint256 _amountIn, IERC20 _fromToken, IERC20 _toToken, bytes calldata _data)
diff --git a/test/ComposableCoW.base.t.sol b/test/ComposableCoW.base.t.sol
index 02ebc5d..4b2718c 100644
--- a/test/ComposableCoW.base.t.sol
+++ b/test/ComposableCoW.base.t.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0 <0.9.0;
 
 import "forge-std/Test.sol";
 
-import {IERC20, IERC20Metadata} from "@openzeppelin/interfaces/IERC20Metadata.sol";
+import {IERC20, IERC20Metadata} from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
 import {Merkle} from "murky/Merkle.sol";
 
 import "safe/Safe.sol";
diff --git a/test/ComposableCoW.stoploss.t.sol b/test/ComposableCoW.stoploss.t.sol
index b9bf4c4..5e1467d 100644
--- a/test/ComposableCoW.stoploss.t.sol
+++ b/test/ComposableCoW.stoploss.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20Metadata} from "@openzeppelin/interfaces/IERC20Metadata.sol";
+import {IERC20Metadata} from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol";
 
 import "./ComposableCoW.base.t.sol";
 import "../src/interfaces/IAggregatorV3Interface.sol";
diff --git a/test/ComposableCoW.twap.t.sol b/test/ComposableCoW.twap.t.sol
index 8cedbaa..7a10303 100644
--- a/test/ComposableCoW.twap.t.sol
+++ b/test/ComposableCoW.twap.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {SafeCast} from "@openzeppelin/utils/math/SafeCast.sol";
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import {ERC1271} from "safe/handler/extensible/SignatureVerifierMuxer.sol";
 
 import "./ComposableCoW.base.t.sol";
diff --git a/test/vendored/GPv2TradeEncoder.sol b/test/vendored/GPv2TradeEncoder.sol
index 2368737..4f96f14 100644
--- a/test/vendored/GPv2TradeEncoder.sol
+++ b/test/vendored/GPv2TradeEncoder.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity >=0.8.0 <0.9.0;
 
-import {IERC20} from "@openzeppelin/interfaces/IERC20.sol";
+import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol";
 
 import {GPv2Order} from "cowprotocol/libraries/GPv2Order.sol";
 import {GPv2Signing} from "cowprotocol/mixins/GPv2Signing.sol";