diff --git a/src/contracts/mocks/MockERC20.sol b/src/contracts/mocks/MockERC20.sol
index 58e3c3f4..f4534e79 100644
--- a/src/contracts/mocks/MockERC20.sol
+++ b/src/contracts/mocks/MockERC20.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {CrucibleFactory} from "alchemist/contracts/crucible/CrucibleFactory.sol";
 
 contract MockERC20 is ERC20 {
     constructor(string memory name, string memory symbol)
-        ERC20(name, symbol, 18)
+        ERC20(name, symbol)
     {}
 
     function mint(address to, uint256 amount) public {
         _mint(to, amount);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/AludelFactory.t.sol b/src/test/AludelFactory.t.sol
index 88e3f3bb..7b183ce0 100644
--- a/src/test/AludelFactory.t.sol
+++ b/src/test/AludelFactory.t.sol
@@ -2,7 +2,7 @@
 // solhint-disable func-name-mixedcase
 pragma solidity ^0.8.17;
 
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {Test} from "forge-std/Test.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
diff --git a/src/test/AludelFactoryIntegration.sol b/src/test/AludelFactoryIntegration.sol
index 7136b684..969cab39 100644
--- a/src/test/AludelFactoryIntegration.sol
+++ b/src/test/AludelFactoryIntegration.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.17;
 
 import {Test} from "forge-std/Test.sol";
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
diff --git a/src/test/AludelV3.t.sol b/src/test/AludelV3.t.sol
index a75b8826..5c26a613 100644
--- a/src/test/AludelV3.t.sol
+++ b/src/test/AludelV3.t.sol
@@ -3,7 +3,7 @@
 pragma solidity ^0.8.6;
 
 import {Test} from "forge-std/Test.sol";
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Vm} from "forge-std/Vm.sol";
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
diff --git a/src/test/Utils.sol b/src/test/Utils.sol
index b3b9f38c..1d50b46f 100644
--- a/src/test/Utils.sol
+++ b/src/test/Utils.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity ^0.8.10;
 
-import {ERC20} from "solmate/src/tokens/ERC20.sol";
+import {ERC20} from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import {Vm} from "forge-std/Vm.sol";
 
 import {AludelFactory} from "../contracts/AludelFactory.sol";
diff --git a/yarn.lock b/yarn.lock
index 01fb8ad0..3fdd3e9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6830,10 +6830,6 @@ solidity-coverage@0.8.0-rc.test.0:
     shelljs "^0.8.3"
     web3-utils "^1.3.0"
 
-"solmate@https://github.com/transmissions11/solmate#3998897acb502fa7b480f505138a6ae1842e8d10":
-  version "6.6.2"
-  resolved "https://github.com/transmissions11/solmate#3998897acb502fa7b480f505138a6ae1842e8d10"
-
 source-map-support@^0.5.13:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"