diff --git a/Cargo.lock b/Cargo.lock
index ead95d53..45996dde 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,9 +208,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pinocchio"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81225b3b8ce092ac54e0d1c55a962be61efcad1d021030f0eb660875703db562"
+checksum = "7c33b58567c11b07749cefbb8320ac023f3387c57807aeb8e3b1262501b6e9f0"
 
 [[package]]
 name = "pinocchio-associated-token-account"
@@ -444,7 +444,6 @@ checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
 name = "typhoon"
 version = "0.1.0-alpha.3"
 dependencies = [
- "pinocchio",
  "pinocchio-pubkey",
  "typhoon-account-macro",
  "typhoon-accounts",
diff --git a/Cargo.toml b/Cargo.toml
index e78bdce2..3a40c304 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -37,7 +37,7 @@ typhoon-utility-traits = { version = "0.1.0-alpha.3", path = "crates/utility-tra
 heck = "0.5.0"
 num-traits = "0.2"
 paste = "1.0"
-pinocchio = "0.8.2"
+pinocchio = "0.8.4"
 pinocchio-associated-token-account = "0.1.1"
 pinocchio-log = "0.4.0"
 pinocchio-pubkey = "0.2.4"
diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml
index 79e0acbd..c9641a4d 100644
--- a/crates/lib/Cargo.toml
+++ b/crates/lib/Cargo.toml
@@ -11,7 +11,6 @@ repository.workspace = true
 borsh = ["typhoon-accounts/borsh"]
 
 [dependencies]
-pinocchio = { workspace = true, features = ["std"] }
 pinocchio-pubkey.workspace = true
 typhoon-accounts.workspace = true
 typhoon-account-macro.workspace = true
diff --git a/examples/anchor-cpi/Cargo.toml b/examples/anchor-cpi/Cargo.toml
index 9f0a7f37..b5052284 100644
--- a/examples/anchor-cpi/Cargo.toml
+++ b/examples/anchor-cpi/Cargo.toml
@@ -1,6 +1,3 @@
 [workspace]
 members = ["programs/*", "tests"]
 resolver = "2"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/anchor-cpi/tests/Cargo.toml b/examples/anchor-cpi/tests/Cargo.toml
index c39cf1bd..08f0c216 100644
--- a/examples/anchor-cpi/tests/Cargo.toml
+++ b/examples/anchor-cpi/tests/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 
 [dev-dependencies]
 bytemuck = "1.21.0"
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 podded = "0.5.2"
 typhoon = { path = "../../../crates/lib" }
 solana-instruction = "2.2.1"
diff --git a/examples/counter/Cargo.toml b/examples/counter/Cargo.toml
index 4f09cd02..4a080cc8 100644
--- a/examples/counter/Cargo.toml
+++ b/examples/counter/Cargo.toml
@@ -18,7 +18,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -26,6 +26,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/hello-world/Cargo.toml b/examples/hello-world/Cargo.toml
index 1b0069fe..89c88dea 100644
--- a/examples/hello-world/Cargo.toml
+++ b/examples/hello-world/Cargo.toml
@@ -16,7 +16,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -24,6 +24,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/instruction-data/Cargo.toml b/examples/instruction-data/Cargo.toml
index e60ca66e..4b0d3bad 100644
--- a/examples/instruction-data/Cargo.toml
+++ b/examples/instruction-data/Cargo.toml
@@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -25,6 +25,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/seeded/Cargo.toml b/examples/seeded/Cargo.toml
index 8e34116e..c8a5a0ed 100644
--- a/examples/seeded/Cargo.toml
+++ b/examples/seeded/Cargo.toml
@@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -25,6 +25,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/seeds/Cargo.toml b/examples/seeds/Cargo.toml
index 7ecc8a3d..2117f543 100644
--- a/examples/seeds/Cargo.toml
+++ b/examples/seeds/Cargo.toml
@@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -25,6 +25,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/transfer-sol/Cargo.toml b/examples/transfer-sol/Cargo.toml
index 6111f924..0b06ca77 100644
--- a/examples/transfer-sol/Cargo.toml
+++ b/examples/transfer-sol/Cargo.toml
@@ -17,7 +17,7 @@ bytemuck = { version = "1.21.0", features = ["derive"] }
 typhoon = { path = "../../crates/lib" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
+litesvm = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -25,6 +25,3 @@ solana-pubkey = "2.2.1"
 solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }
diff --git a/examples/transfer-token/Cargo.toml b/examples/transfer-token/Cargo.toml
index 9b72470c..7e7c3d8c 100644
--- a/examples/transfer-token/Cargo.toml
+++ b/examples/transfer-token/Cargo.toml
@@ -18,8 +18,8 @@ typhoon = { path = "../../crates/lib" }
 typhoon-token = { path = "../../crates/token" }
 
 [dev-dependencies]
-litesvm = "0.6.0"
-litesvm-token = "0.6.0"
+litesvm = "0.6.1"
+litesvm-token = "0.6.1"
 solana-instruction = "2.2.1"
 solana-keypair = "2.2.1"
 solana-native-token = "2.2.1"
@@ -28,6 +28,3 @@ solana-signer = "2.2.1"
 solana-system-interface = "1.0.0"
 solana-transaction = "2.2.1"
 spl-associated-token-account-client = "2.0.0"
-
-[patch.crates-io]
-pinocchio = { git = "https://github.com/Aursen/pinocchio", branch = "fix/cfg" }