diff --git a/.gitmodules b/.gitmodules
index 5409efd..a64e2c2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,6 @@
 [submodule "lib/morpho-blue"]
 	path = lib/morpho-blue
 	url = https://github.com/morpho-org/morpho-blue
-[submodule "lib/v3-core"]
-	path = lib/v3-core
-	url = https://github.com/uniswap/v3-core
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
new file mode 160000
index 0000000..932fddf
--- /dev/null
+++ b/lib/openzeppelin-contracts
@@ -0,0 +1 @@
+Subproject commit 932fddf69a699a9a80fd2396fd1a2ab91cdda123
diff --git a/lib/v3-core b/lib/v3-core
deleted file mode 160000
index 6562c52..0000000
--- a/lib/v3-core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6562c52e8f75f0c10f9deaf44861847585fc8129
diff --git a/src/ChainlinkOracle.sol b/src/ChainlinkOracle.sol
index dd6f1cd..2f8abee 100644
--- a/src/ChainlinkOracle.sol
+++ b/src/ChainlinkOracle.sol
@@ -1,19 +1,19 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-pragma solidity 0.8.19;
+pragma solidity 0.8.21;
 
 import {IOracle} from "../lib/morpho-blue/src/interfaces/IOracle.sol";
 
 import {AggregatorV3Interface, ChainlinkDataFeedLib} from "./libraries/ChainlinkDataFeedLib.sol";
 import {IERC4626, VaultLib} from "./libraries/VaultLib.sol";
 import {ErrorsLib} from "./libraries/ErrorsLib.sol";
-import {FullMath} from "../lib/v3-core/contracts/libraries/FullMath.sol";
+import {Math} from "../lib/openzeppelin-contracts/contracts/utils/math/Math.sol";
 
 /// @title ChainlinkOracle
 /// @author Morpho Labs
 /// @custom:contact security@morpho.org
 /// @notice Morpho Blue oracle using Chainlink-compliant feeds.
 contract ChainlinkOracle is IOracle {
-    using FullMath for uint256;
+    using Math for uint256;
     using VaultLib for IERC4626;
     using ChainlinkDataFeedLib for AggregatorV3Interface;