diff --git a/Cargo.lock b/Cargo.lock
index 5ad442791a6..f22b0ef96ca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2117,7 +2117,7 @@ dependencies = [
 [[package]]
 name = "crucible-agent-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=75ea3408643664877aa603ffc65996ed6dc34c0a#75ea3408643664877aa603ffc65996ed6dc34c0a"
+source = "git+https://github.com/oxidecomputer/crucible?branch=mkeeter%2Fsingle-block-validation#51794d4c724f3f3d23d04ef362f9271703c930a0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2146,7 +2146,7 @@ dependencies = [
 [[package]]
 name = "crucible-common"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=75ea3408643664877aa603ffc65996ed6dc34c0a#75ea3408643664877aa603ffc65996ed6dc34c0a"
+source = "git+https://github.com/oxidecomputer/crucible?branch=mkeeter%2Fsingle-block-validation#51794d4c724f3f3d23d04ef362f9271703c930a0"
 dependencies = [
  "anyhow",
  "atty",
@@ -2176,7 +2176,7 @@ dependencies = [
 [[package]]
 name = "crucible-pantry-client"
 version = "0.0.1"
-source = "git+https://github.com/oxidecomputer/crucible?rev=75ea3408643664877aa603ffc65996ed6dc34c0a#75ea3408643664877aa603ffc65996ed6dc34c0a"
+source = "git+https://github.com/oxidecomputer/crucible?branch=mkeeter%2Fsingle-block-validation#51794d4c724f3f3d23d04ef362f9271703c930a0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2193,7 +2193,7 @@ dependencies = [
 [[package]]
 name = "crucible-smf"
 version = "0.0.0"
-source = "git+https://github.com/oxidecomputer/crucible?rev=75ea3408643664877aa603ffc65996ed6dc34c0a#75ea3408643664877aa603ffc65996ed6dc34c0a"
+source = "git+https://github.com/oxidecomputer/crucible?branch=mkeeter%2Fsingle-block-validation#51794d4c724f3f3d23d04ef362f9271703c930a0"
 dependencies = [
  "crucible-workspace-hack",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 0aa02a2e81c..ea65e966b5a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -416,10 +416,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
 # NOTE: if you change the pinned revision of the `crucible` dependencies, you
 # must also update the references in package-manifest.toml to match the new
 # revision.
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
-crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "75ea3408643664877aa603ffc65996ed6dc34c0a" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", branch = "mkeeter/single-block-validation" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", branch = "mkeeter/single-block-validation" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", branch = "mkeeter/single-block-validation" }
+crucible-common = { git = "https://github.com/oxidecomputer/crucible", branch = "mkeeter/single-block-validation" }
 # NOTE: See above!
 csv = "1.3.1"
 curve25519-dalek = "4"
diff --git a/package-manifest.toml b/package-manifest.toml
index 90f8bc1df80..42bce254ab6 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -595,10 +595,10 @@ only_for_targets.image = "standard"
 # 3. Use source.type = "manual" instead of "prebuilt"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "75ea3408643664877aa603ffc65996ed6dc34c0a"
+source.commit = "51794d4c724f3f3d23d04ef362f9271703c930a0"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
-source.sha256 = "fd0e150de5792a1d04b2cf4c4754d828284227ee4526ea5d08b01cfa71e2dd6a"
+source.sha256 = "504b91d789181bf81e175d7f4bf8136cf51e1669ae8d8c8ec13321414399257b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -607,10 +607,10 @@ service_name = "crucible_pantry_prebuilt"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "75ea3408643664877aa603ffc65996ed6dc34c0a"
+source.commit = "51794d4c724f3f3d23d04ef362f9271703c930a0"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
-source.sha256 = "096b56c0db4e28a8bb216ee3bf96c06040a764101d8a3f497a175cf790613bd2"
+source.sha256 = "2615b1364405068e445767013ad7c6d20e3fea909373b8a2cb26f87da4f8cdc7"
 output.type = "zone"
 output.intermediate_only = true