diff --git a/Cargo.lock b/Cargo.lock
index 785640d4..7d9814a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -147,7 +147,7 @@ dependencies = [
  "nom",
  "num-traits",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
@@ -230,7 +230,7 @@ dependencies = [
  "serde_cbor",
  "serde_with 2.3.3",
  "sha2 0.10.8",
- "thiserror",
+ "thiserror 1.0.69",
  "webpki",
  "x509-parser",
 ]
@@ -596,7 +596,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-util",
  "toml 0.5.11",
@@ -1111,7 +1111,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-util",
  "toml 0.5.11",
@@ -1158,7 +1158,7 @@ dependencies = [
  "serial_test",
  "sha2 0.9.9",
  "tempfile",
- "thiserror",
+ "thiserror 2.0.12",
  "tokio",
  "tokio-rustls",
  "tokio-stream",
@@ -2136,7 +2136,7 @@ dependencies = [
  "once_cell",
  "parking_lot",
  "textwrap",
- "thiserror",
+ "thiserror 1.0.69",
 ]
 
 [[package]]
@@ -3147,7 +3147,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
  "url",
  "uuid",
@@ -3628,7 +3628,16 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
 dependencies = [
- "thiserror-impl",
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+dependencies = [
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
@@ -3642,6 +3651,17 @@ dependencies = [
  "syn 2.0.98",
 ]
 
+[[package]]
+name = "thiserror-impl"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.98",
+]
+
 [[package]]
 name = "time"
 version = "0.3.37"
@@ -4454,7 +4474,7 @@ dependencies = [
  "nom",
  "oid-registry",
  "rusticata-macros",
- "thiserror",
+ "thiserror 1.0.69",
  "time",
 ]
 
diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml
index e413ad23..bacefdfa 100644
--- a/crates/common/Cargo.toml
+++ b/crates/common/Cargo.toml
@@ -10,7 +10,7 @@ async-trait = "0.1.57"
 reqwest = { version = "0.11.12", features = ["json", "stream"] }
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
-thiserror = "1.0.31"
+thiserror = "2.0.12"
 exitcode = "1.1.2"
 toml = "0.5.9"
 elliptic-curve = { version = "0.13.8", features = ["pkcs8"] }
diff --git a/crates/ev-cli/Cargo.toml b/crates/ev-cli/Cargo.toml
index 40769274..0cbe0047 100644
--- a/crates/ev-cli/Cargo.toml
+++ b/crates/ev-cli/Cargo.toml
@@ -33,7 +33,7 @@ serde_json = "1.0.116"
 strum = { version = "0.26.2", features = [ "derive", "strum_macros" ]}
 strum_macros = "0.26.2"
 tempfile = "3.10.1"
-thiserror = "1.0.59"
+thiserror = "2.0.12"
 tokio = {version = "1.45.0", features = ["rt", "rt-multi-thread", "macros", "fs"]}
 tokio-util = "0.7.11"
 toml = "0.5.9"
diff --git a/crates/ev-enclave/Cargo.toml b/crates/ev-enclave/Cargo.toml
index cff22898..afa8dc0d 100644
--- a/crates/ev-enclave/Cargo.toml
+++ b/crates/ev-enclave/Cargo.toml
@@ -19,7 +19,7 @@ env_logger = "0.9.0"
 atty = "0.2.14"
 serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.91"
-thiserror = "1.0.31"
+thiserror = "2.0.12"
 rcgen = { version = "0.13.2", features = ["pem"] }
 chrono = "0.4.19"
 toml = "0.5.9"