diff --git a/Cargo.lock b/Cargo.lock
index 9a6b1b61bbf..5456540aa3d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3403,7 +3403,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-aggregator"
-version = "0.5.78"
+version = "0.5.79"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3630,7 +3630,7 @@ dependencies = [
 
 [[package]]
 name = "mithril-end-to-end"
-version = "0.4.38"
+version = "0.4.39"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/mithril-aggregator/Cargo.toml b/mithril-aggregator/Cargo.toml
index 7e7e094db63..da9bbd7afca 100644
--- a/mithril-aggregator/Cargo.toml
+++ b/mithril-aggregator/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.78"
+version = "0.5.79"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }
diff --git a/mithril-aggregator/src/dependency_injection/builder.rs b/mithril-aggregator/src/dependency_injection/builder.rs
index 7a9ce67f483..01d0d7d0898 100644
--- a/mithril-aggregator/src/dependency_injection/builder.rs
+++ b/mithril-aggregator/src/dependency_injection/builder.rs
@@ -1451,6 +1451,9 @@ impl DependenciesBuilder {
             "Dependencies Builder can not get Cardano network while building genesis container"
         })?;
 
+        // Disable store pruning for genesis commands
+        self.configuration.store_retention_limit = None;
+
         let dependencies = GenesisToolsDependency {
             network,
             ticker_service: self.get_ticker_service().await?,
diff --git a/mithril-test-lab/mithril-end-to-end/Cargo.toml b/mithril-test-lab/mithril-end-to-end/Cargo.toml
index 7d714f04c8a..b34aaad2434 100644
--- a/mithril-test-lab/mithril-end-to-end/Cargo.toml
+++ b/mithril-test-lab/mithril-end-to-end/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mithril-end-to-end"
-version = "0.4.38"
+version = "0.4.39"
 authors = { workspace = true }
 edition = { workspace = true }
 documentation = { workspace = true }
diff --git a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
index 73bf5937c4d..805a2c8016f 100644
--- a/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
+++ b/mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs
@@ -147,7 +147,8 @@ impl Aggregator {
     pub async fn bootstrap_genesis(&mut self) -> StdResult<()> {
         // Clone the command so we can alter it without affecting the original
         let mut command = self.command.clone();
-        command.set_log_name("mithril-aggregator-genesis-bootstrap");
+        let process_name = "mithril-aggregator-genesis-bootstrap";
+        command.set_log_name(process_name);
 
         let exit_status = command
             .start(&["genesis".to_string(), "bootstrap".to_string()])?
@@ -158,6 +159,8 @@ impl Aggregator {
         if exit_status.success() {
             Ok(())
         } else {
+            self.command.tail_logs(Some(process_name), 40).await?;
+
             Err(match exit_status.code() {
                 Some(c) => {
                     anyhow!("`mithril-aggregator genesis bootstrap` exited with code: {c}")