diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 92e4318..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,8 +0,0 @@
-[submodule "lib/forge-std"]
-  branch = "v1"
-  path = "lib/forge-std"
-  url = "https://github.com/foundry-rs/forge-std"
-[submodule "lib/prb-test"]
-  branch = "release-v0"
-  path = "lib/prb-test"
-  url = "https://github.com/PaulRBerg/prb-test"
diff --git a/codecov.yml b/codecov.yml
index ba8825e..a09ec2f 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,4 +1,5 @@
 comment: false
 ignore:
   - "script"
+  - "src/test/"
   - "test"
diff --git a/lib/forge-std b/lib/forge-std
deleted file mode 160000
index 73d44ec..0000000
--- a/lib/forge-std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 73d44ec7d124e3831bc5f832267889ffb6f9bc3f
diff --git a/package.json b/package.json
index d236560..c1634d8 100644
--- a/package.json
+++ b/package.json
@@ -9,10 +9,9 @@
   "bugs": {
     "url": "https://github.com/PaulRBerg/prb-proxy/issues"
   },
-  "dependencies": {
-    "@prb/test": "0.6.4"
-  },
   "devDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4",
     "prettier": "^2.8.8",
     "solhint-community": "^3.5.2"
   },
@@ -32,6 +31,10 @@
     "solidity"
   ],
   "license": "MIT",
+  "peerDependencies": {
+    "@forge/std": "github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e",
+    "@prb/test": "0.6.4"
+  },
   "publishConfig": {
     "access": "public"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e6caaa3..da2a697 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,12 +4,13 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-dependencies:
+devDependencies:
+  '@forge/std':
+    specifier: github:foundry-rs/forge-std#e8a047e3f40f13fa37af6fe14e6e06283d9a060e
+    version: github.com/foundry-rs/forge-std/e8a047e3f40f13fa37af6fe14e6e06283d9a060e
   '@prb/test':
     specifier: 0.6.4
     version: 0.6.4
-
-devDependencies:
   prettier:
     specifier: ^2.8.8
     version: 2.8.8
@@ -42,7 +43,7 @@ packages:
 
   /@prb/test@0.6.4:
     resolution: {integrity: sha512-P0tTMsB6XQ0Wp61EYdXJYFhsOVGyZvcOFub2y9yk0sF+GYDusctR7DzEI+vOP0SILm3knFkEJASjewHEBppdRQ==}
-    dev: false
+    dev: true
 
   /@solidity-parser/parser@0.16.0:
     resolution: {integrity: sha512-ESipEcHyRHg4Np4SqBCfcXwyxxna1DgFVz69bgpLV8vzl/NP1DtcKsJ4dJZXWQhY/Z4J2LeKBiOkOVZn9ct33Q==}
@@ -451,3 +452,9 @@ packages:
   /wrappy@1.0.2:
     resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
     dev: true
+
+  github.com/foundry-rs/forge-std/e8a047e3f40f13fa37af6fe14e6e06283d9a060e:
+    resolution: {tarball: https://codeload.github.com/foundry-rs/forge-std/tar.gz/e8a047e3f40f13fa37af6fe14e6e06283d9a060e}
+    name: forge-std
+    version: 1.5.6
+    dev: true
diff --git a/remappings.txt b/remappings.txt
index f8907fb..c58f4c8 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,2 +1,2 @@
+@forge-std/=node_modules/@forge/std/
 @prb/test/=node_modules/@prb/test
-forge-std/=lib/forge-std/src/
diff --git a/script/Base.s.sol b/script/Base.s.sol
index 2a106d7..39b2069 100644
--- a/script/Base.s.sol
+++ b/script/Base.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.19 <=0.9.0;
 
-import { Script } from "forge-std/Script.sol";
+import { Script } from "@forge-std/src/Script.sol";
 
 abstract contract BaseScript is Script {
     /// @dev Included to enable compilation of the script without a $MNEMONIC environment variable.
diff --git a/test/Base.t.sol b/test/Base.t.sol
index 944099b..9b5d62f 100644
--- a/test/Base.t.sol
+++ b/test/Base.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <=0.9.0;
 
+import { StdCheats } from "@forge-std/src/StdCheats.sol";
+import { StdUtils } from "@forge-std/src/StdUtils.sol";
 import { eqString } from "@prb/test/src/Helpers.sol";
-import { StdCheats } from "forge-std/StdCheats.sol";
-import { StdUtils } from "forge-std/StdUtils.sol";
 
 import { IPRBProxy } from "../src/interfaces/IPRBProxy.sol";
 import { IPRBProxyRegistry } from "../src/interfaces/IPRBProxyRegistry.sol";
diff --git a/test/proxy/execute/execute.t.sol b/test/proxy/execute/execute.t.sol
index caee1e8..ee356ce 100644
--- a/test/proxy/execute/execute.t.sol
+++ b/test/proxy/execute/execute.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <=0.9.0;
 
-import { stdError } from "forge-std/StdError.sol";
+import { stdError } from "@forge-std/src/StdError.sol";
 
 import { IPRBProxy } from "src/interfaces/IPRBProxy.sol";
 
diff --git a/test/proxy/run-plugin/runPlugin.t.sol b/test/proxy/run-plugin/runPlugin.t.sol
index 322961c..b8f218c 100644
--- a/test/proxy/run-plugin/runPlugin.t.sol
+++ b/test/proxy/run-plugin/runPlugin.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.18 <0.9.0;
 
-import { stdError } from "forge-std/StdError.sol";
+import { stdError } from "@forge-std/src/StdError.sol";
 
 import { IPRBProxy } from "src/interfaces/IPRBProxy.sol";