diff --git a/Cargo.lock b/Cargo.lock
index d4856b5851c..d1940d5035b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -894,7 +894,7 @@ dependencies = [
  "camino-tempfile",
  "chacha20poly1305",
  "ciborium",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "hex",
  "hkdf 0.12.4",
  "omicron-ledger",
@@ -1581,7 +1581,7 @@ dependencies = [
  "camino-tempfile",
  "chrono",
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "expectorate",
  "iddqd",
  "itertools 0.14.0",
@@ -8165,7 +8165,7 @@ dependencies = [
  "cookie",
  "daft",
  "derive-where",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "either",
  "ereport-types",
@@ -9592,7 +9592,7 @@ dependencies = [
  "clickhouse-admin-types",
  "crucible-agent-client",
  "crucible-client-types",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dice-verifier 0.3.0-pre0 (git+https://github.com/oxidecomputer/dice-util?branch=main)",
  "display-error-chain",
  "dpd-client 0.1.0 (git+https://github.com/oxidecomputer/dendrite?rev=cc0c307c617f2988aafdca4e3bd35ea178b64801)",
@@ -9794,6 +9794,8 @@ dependencies = [
  "daft",
  "data-encoding",
  "der 0.7.10",
+ "derive_more 2.1.1",
+ "derive_more-impl",
  "digest 0.10.7",
  "digest 0.11.3",
  "dof 0.3.0",
@@ -13857,7 +13859,7 @@ dependencies = [
  "camino-tempfile-ext",
  "chrono",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "either",
  "expectorate",
@@ -13932,7 +13934,7 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "futures",
  "illumos-utils",
@@ -14231,7 +14233,7 @@ dependencies = [
  "camino-tempfile",
  "cfg-if",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "expectorate",
  "futures",
  "glob",
@@ -16067,7 +16069,7 @@ dependencies = [
  "ciborium",
  "daft",
  "debug-ignore",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "futures",
  "gfss",
@@ -16116,7 +16118,7 @@ dependencies = [
  "chacha20poly1305",
  "ciborium",
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "dropshot",
  "gfss",
  "hex",
@@ -16182,7 +16184,7 @@ version = "0.1.0"
 dependencies = [
  "byte-wrapper",
  "daft",
- "derive_more 0.99.20",
+ "derive_more 2.1.1",
  "gfss",
  "iddqd",
  "omicron-uuid-kinds",
diff --git a/Cargo.toml b/Cargo.toml
index f8828bf2cc6..8ba0d42c0fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -499,7 +499,7 @@ omicron-ddm-admin-client = { path = "clients/ddm-admin-client" }
 datatest-stable = "0.3.2"
 db-macros = { path = "nexus/db-macros" }
 debug-ignore = "1.0.5"
-derive_more = "0.99.20"
+derive_more = "2.1.1"
 derive-where = "1.5.0"
 dev-tools-common = { path = "dev-tools/common" }
 dice-verifier = { git = "https://github.com/oxidecomputer/dice-util", branch = "main", default-features = false }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
index 634077d7307..a7cf14624a0 100644
--- a/workspace-hack/Cargo.toml
+++ b/workspace-hack/Cargo.toml
@@ -47,6 +47,7 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil
 daft = { version = "0.1.7", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] }
 data-encoding = { version = "2.10.0" }
 der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
+derive_more = { version = "2.1.1", features = ["is_variant"] }
 digest-93f6ce9d446188ac = { package = "digest", version = "0.10.7", features = ["mac", "oid", "std"] }
 digest-a6292c17cd707f01 = { package = "digest", version = "0.11.3", features = ["alloc", "mac", "oid"] }
 ed25519-dalek = { version = "2.2.0", features = ["digest", "pem", "rand_core"] }
@@ -194,6 +195,8 @@ curve25519-dalek = { version = "4.1.3", features = ["digest", "legacy_compatibil
 daft = { version = "0.1.7", features = ["derive", "newtype-uuid1", "oxnet01", "uuid1"] }
 data-encoding = { version = "2.10.0" }
 der = { version = "0.7.10", default-features = false, features = ["derive", "flagset", "oid", "pem", "std"] }
+derive_more = { version = "2.1.1", features = ["is_variant"] }
+derive_more-impl = { version = "2.1.1", features = ["is_variant"] }
 digest-93f6ce9d446188ac = { package = "digest", version = "0.10.7", features = ["mac", "oid", "std"] }
 digest-a6292c17cd707f01 = { package = "digest", version = "0.11.3", features = ["alloc", "mac", "oid"] }
 ed25519-dalek = { version = "2.2.0", features = ["digest", "pem", "rand_core"] }