diff --git a/.github/workflows/contracts.yaml b/.github/workflows/contracts.yaml
index 68f144b..21b0993 100644
--- a/.github/workflows/contracts.yaml
+++ b/.github/workflows/contracts.yaml
@@ -36,8 +36,8 @@ jobs:
       - name: Compile
         run: |
           forge build --build-info
-          solc-select install 0.8.17
-          solc-select use 0.8.17
+          solc-select install 0.8.21
+          solc-select use 0.8.21
 
       - name: Run forge tests
         run: forge test -vvv
diff --git a/.gitmodules b/.gitmodules
index f67502a..7eb5cb1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std.git
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
diff --git a/contract-utils/openzeppelin-contracts b/contract-utils/openzeppelin-contracts
new file mode 160000
index 0000000..54a235f
--- /dev/null
+++ b/contract-utils/openzeppelin-contracts
@@ -0,0 +1 @@
+Subproject commit 54a235f8959ecffb1916cf5693ec9bbd695cbf71
diff --git a/lib/forge-std b/lib/forge-std
index 405727d..f18e8aa 160000
--- a/lib/forge-std
+++ b/lib/forge-std
@@ -1 +1 @@
-Subproject commit 405727dc7580aaaa6e5b626638dd37ff171beae3
+Subproject commit f18e8aa3e72eef83518766eb34ad8c8d8e2aa0aa
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
new file mode 160000
index 0000000..54a235f
--- /dev/null
+++ b/lib/openzeppelin-contracts
@@ -0,0 +1 @@
+Subproject commit 54a235f8959ecffb1916cf5693ec9bbd695cbf71
diff --git a/remappings.txt b/remappings.txt
index 845bd0a..963bbbe 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,2 +1,3 @@
 ds-test/=lib/forge-std/lib/ds-test/src/
 forge-std/=lib/forge-std/src/
+openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/
\ No newline at end of file