diff --git a/Cargo.lock b/Cargo.lock
index 23d8a1c8d..f0f1e3859 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2540,9 +2540,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.162"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01506398"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "libloading"
@@ -2913,8 +2913,7 @@ checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
 [[package]]
 name = "op-alloy-consensus"
 version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "862db7293434837c1ca32ef509806a7b330bd24605da95438cd6e928a58b4b2c"
+source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -2923,14 +2922,13 @@ dependencies = [
  "alloy-serde",
  "derive_more",
  "serde",
- "spin",
+ "thiserror 2.0.3",
 ]
 
 [[package]]
 name = "op-alloy-genesis"
 version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ebd0391a3123b47e44ccca8a6f63a39ead2d7ea52e4fc132ff1297f6184314e"
+source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -2938,14 +2936,15 @@ dependencies = [
  "alloy-sol-types",
  "serde",
  "serde_repr",
+ "thiserror 2.0.3",
 ]
 
 [[package]]
 name = "op-alloy-protocol"
 version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0220768efb59871af53e1685b90983c9f3090cdf45df3d0107348362ba7055ee"
+source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0"
 dependencies = [
+ "alloc-no-stdlib",
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
@@ -2953,10 +2952,11 @@ dependencies = [
  "alloy-serde",
  "async-trait",
  "brotli",
- "derive_more",
+ "miniz_oxide",
  "op-alloy-consensus",
  "op-alloy-genesis",
  "serde",
+ "thiserror 2.0.3",
  "tracing",
  "unsigned-varint",
 ]
@@ -2964,8 +2964,7 @@ dependencies = [
 [[package]]
 name = "op-alloy-rpc-types-engine"
 version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd1a11a9cf2f2e8ed9ae11c93dce5990ff81ff98f17995772f567b586a864812"
+source = "git+https://github.com/alloy-rs/op-alloy?branch=main#cbac051d27b01fb85d1d628428a9ca8f9e9d9ad0"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -2975,6 +2974,7 @@ dependencies = [
  "op-alloy-consensus",
  "op-alloy-protocol",
  "serde",
+ "thiserror 2.0.3",
 ]
 
 [[package]]
@@ -3051,28 +3051,29 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.12"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
+checksum = "8be4817d39f3272f69c59fe05d0535ae6456c2dc2fa1ba02910296c7e0a5c590"
 dependencies = [
  "arrayvec",
  "bitvec",
  "byte-slice-cast",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
+ "rustversion",
  "serde",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.12"
+version = "3.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
+checksum = "8781a75c6205af67215f382092b6e0a4ff3734798523e69073d4bcd294ec767b"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.87",
 ]
 
 [[package]]
@@ -3780,9 +3781,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.16"
+version = "0.23.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e"
+checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -3978,9 +3979,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "indexmap 2.6.0",
  "itoa",
@@ -4882,9 +4883,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasmtimer"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb4f099acbc1043cc752b91615b24b02d7f6fcd975bd781fed9f50b3c3e15bf7"
+checksum = "0048ad49a55b9deb3953841fa1fc5858f0efbcb7a18868c899a360269fac1b23"
 dependencies = [
  "futures",
  "js-sys",
diff --git a/Cargo.toml b/Cargo.toml
index 53d4c6e41..97d2d737a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,6 +24,12 @@ default-members = ["bin/host", "bin/client"]
 # https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
 resolver = "2"
 
+[patch.crates-io]
+op-alloy-genesis = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
+op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
+op-alloy-consensus = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
+op-alloy-rpc-types-engine = { git = "https://github.com/alloy-rs/op-alloy", branch = "main" }
+
 [workspace.lints.rust]
 missing-debug-implementations = "warn"
 missing-docs = "warn"
diff --git a/crates/derive/src/errors/pipeline.rs b/crates/derive/src/errors/pipeline.rs
index d3b8bc2ef..ecf4c739e 100644
--- a/crates/derive/src/errors/pipeline.rs
+++ b/crates/derive/src/errors/pipeline.rs
@@ -3,7 +3,7 @@
 use crate::errors::BuilderError;
 use alloc::string::String;
 use alloy_primitives::B256;
-use op_alloy_genesis::system::SystemConfigUpdateError;
+use op_alloy_genesis::SystemConfigUpdateError;
 use op_alloy_protocol::{DepositError, SpanBatchError};
 use thiserror::Error;
 
diff --git a/crates/derive/src/stages/l1_traversal.rs b/crates/derive/src/stages/l1_traversal.rs
index afc60ce31..6df4cc2bd 100644
--- a/crates/derive/src/stages/l1_traversal.rs
+++ b/crates/derive/src/stages/l1_traversal.rs
@@ -145,7 +145,7 @@ pub(crate) mod tests {
     use alloc::vec;
     use alloy_consensus::Receipt;
     use alloy_primitives::{address, b256, hex, Bytes, Log, LogData, B256};
-    use op_alloy_genesis::system::{CONFIG_UPDATE_EVENT_VERSION_0, CONFIG_UPDATE_TOPIC};
+    use op_alloy_genesis::{CONFIG_UPDATE_EVENT_VERSION_0, CONFIG_UPDATE_TOPIC};
 
     const L1_SYS_CONFIG_ADDR: Address = address!("1337000000000000000000000000000000000000");