diff --git a/Cargo.lock b/Cargo.lock
index 03198dc6..d82d6df8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -403,7 +403,7 @@ dependencies = [
  "flate2",
  "futures-util",
  "minicbor 0.25.1",
- "pallas-primitives 0.33.0",
+ "pallas-traverse 0.33.0",
  "reqwest 0.12.24",
  "serde",
  "serde_json",
diff --git a/modules/snapshot_bootstrapper/Cargo.toml b/modules/snapshot_bootstrapper/Cargo.toml
index d54eff44..857316da 100644
--- a/modules/snapshot_bootstrapper/Cargo.toml
+++ b/modules/snapshot_bootstrapper/Cargo.toml
@@ -14,7 +14,7 @@ acropolis_common = { path = "../../common" }
 caryatid_sdk = { workspace = true }
 
 anyhow = { workspace = true }
-pallas-primitives = { workspace = true }
+pallas-traverse = { workspace = true }
 config = { workspace = true }
 minicbor = { version = "0.25.1", features = ["std", "half", "derive"] }
 tokio = { workspace = true }
diff --git a/modules/snapshot_bootstrapper/src/bootstrapper.rs b/modules/snapshot_bootstrapper/src/bootstrapper.rs
index 8014d2b3..67d004b4 100644
--- a/modules/snapshot_bootstrapper/src/bootstrapper.rs
+++ b/modules/snapshot_bootstrapper/src/bootstrapper.rs
@@ -91,36 +91,43 @@ impl SnapshotBootstrapper {
     ) -> Result<(), BootstrapError> {
         Self::wait_for_genesis(bootstrapped_sub).await?;
 
-        let data = BootstrapContext::load(&cfg)?;
-        info!("Loaded bootstrap data for epoch {}", data.block_info.epoch);
-        info!("  Snapshot: {}", data.snapshot.url);
+        let bootstrap_ctx = BootstrapContext::load(&cfg)?;
         info!(
-            "  Block: slot={}, height={}",
-            data.block_info.slot, data.block_info.number
+            "Loaded bootstrap data for epoch {}",
+            bootstrap_ctx.block_info.epoch
+        );
+        info!("  Snapshot: {}", bootstrap_ctx.snapshot.url);
+        info!(
+            "  Block: slot={}, number={}",
+            bootstrap_ctx.block_info.slot, bootstrap_ctx.block_info.number
         );
 
         // Download
-        let downloader = SnapshotDownloader::new(data.network_dir(), &cfg.download)?;
-        downloader.download(&data.snapshot).await?;
+        let downloader = SnapshotDownloader::new(bootstrap_ctx.network_dir(), &cfg.download)?;
+        downloader.download(&bootstrap_ctx.snapshot).await.map_err(BootstrapError::Download)?;
 
         // Publish
         let mut publisher = SnapshotPublisher::new(
             context,
             cfg.completion_topic.clone(),
             cfg.snapshot_topic.clone(),
-            data.context(),
+            bootstrap_ctx.context(),
         );
 
         publisher.publish_start().await?;
 
-        info!("Parsing snapshot: {}", data.snapshot_path().display());
+        info!(
+            "Parsing snapshot: {}",
+            bootstrap_ctx.snapshot_path().display()
+        );
         let start = Instant::now();
-        let parser =
-            StreamingSnapshotParser::new(data.snapshot_path().to_string_lossy().into_owned());
+        let parser = StreamingSnapshotParser::new(
+            bootstrap_ctx.snapshot_path().to_string_lossy().into_owned(),
+        );
         parser.parse(&mut publisher).map_err(|e| BootstrapError::Parse(e.to_string()))?;
         info!("Parsed snapshot in {:.2?}", start.elapsed());
 
-        publisher.publish_completion(data.block_info).await?;
+        publisher.publish_completion(bootstrap_ctx.block_info).await?;
 
         info!("Snapshot bootstrap completed");
         Ok(())
diff --git a/modules/snapshot_bootstrapper/src/context.rs b/modules/snapshot_bootstrapper/src/context.rs
index 7ead54cd..b101ae32 100644
--- a/modules/snapshot_bootstrapper/src/context.rs
+++ b/modules/snapshot_bootstrapper/src/context.rs
@@ -77,7 +77,7 @@ impl BootstrapContext {
             hash: *hash,
             epoch: target_epoch,
             epoch_slot,
-            new_epoch: true,
+            new_epoch: false,
             timestamp: genesis.slot_to_timestamp(slot),
             era: Era::Conway, // TODO: Make dynamic with era history
         };
diff --git a/modules/snapshot_bootstrapper/src/header.rs b/modules/snapshot_bootstrapper/src/header.rs
index cd53f85c..c13736ab 100644
--- a/modules/snapshot_bootstrapper/src/header.rs
+++ b/modules/snapshot_bootstrapper/src/header.rs
@@ -1,8 +1,8 @@
 #![allow(dead_code, unused)]
 use acropolis_common::hash::Hash;
 use acropolis_common::Point;
-use pallas_primitives::babbage::MintedHeader;
-use pallas_primitives::conway::Header as ConwayHeader;
+use pallas_traverse::Era::Conway;
+use pallas_traverse::MultiEraHeader;
 use std::fs;
 use std::path::{Path, PathBuf};
 use thiserror::Error;
@@ -48,13 +48,11 @@ impl HeaderContext {
     pub fn load(network_dir: &Path, point: &Point) -> Result<Self, HeaderContextError> {
         let path = Self::path(network_dir, point)?;
         let cbor = fs::read(&path).map_err(|e| HeaderContextError::ReadFile(path, e))?;
-
-        let minted: MintedHeader<'_> = minicbor::decode(&cbor)
+        let header = MultiEraHeader::decode(Conway as u8, None, &cbor)
             .map_err(|e| HeaderContextError::Decode(point.slot(), e.to_string()))?;
-        let header = ConwayHeader::from(minted);
         Ok(Self {
             point: point.clone(),
-            block_number: header.header_body.block_number,
+            block_number: header.number(),
         })
     }
 }