diff --git a/README.md b/README.md
index 6a7c388..2a326a4 100644
--- a/README.md
+++ b/README.md
@@ -24,10 +24,12 @@ foundryup
 
 Install OpenZeppelin
 ```
-forge install OpenZeppelin/openzeppelin-contracts
-forge remappings > remappings.txt
+forge install OpenZeppelin/openzeppelin-contracts --no-commit
+forge install smartcontractkit/chainlink-brownie-contracts@0.8.0 --no-commit
 ```
 
+If needed, to init remappings use `forge remappings > remappings.txt`
+
 ### Add private key to foundry keystore
 
 ```bash
diff --git a/contracts/lib/chainlink-brownie-contracts b/contracts/lib/chainlink-brownie-contracts
index 789a388..f06ed4c 160000
--- a/contracts/lib/chainlink-brownie-contracts
+++ b/contracts/lib/chainlink-brownie-contracts
@@ -1 +1 @@
-Subproject commit 789a3888101c14416fa21aa9bc2c049e283c94e2
+Subproject commit f06ed4c7e43de0359e0e337ce56e55cab90b0178
diff --git a/contracts/remappings.txt b/contracts/remappings.txt
index ac85702..bd4628b 100644
--- a/contracts/remappings.txt
+++ b/contracts/remappings.txt
@@ -1,4 +1,6 @@
-@std=lib/forge-std/src/
-forge-std/=lib/forge-std/src/
+@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
+@chainlink/contracts/=lib/chainlink-brownie-contracts/contracts/
 ds-test/=lib/forge-std/lib/ds-test/src/
-@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/
\ No newline at end of file
+erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/
+forge-std/=lib/forge-std/src/
+openzeppelin-contracts/=lib/openzeppelin-contracts/