diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b4ad5be8..c48e19db 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -102,7 +102,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          version: v1.5.1
 
       - name: Install forge dependencies
         run: forge install
@@ -124,7 +124,7 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
-          version: nightly
+          version: v1.5.1
 
       - name: Install forge dependencies
         run: forge install
diff --git a/.gitmodules b/.gitmodules
index 50a2dacd..0601fc1d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,6 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-	branch = v1.5.0
 [submodule "lib/ERC721A"]
 	path = lib/ERC721A
 	url = https://github.com/chiru-labs/ERC721A
@@ -29,4 +28,3 @@
 [submodule "lib/create2-helpers"]
 	path = lib/create2-helpers
 	url = https://github.com/emo-eth/create2-helpers
-	branch = v0.1.3