diff --git a/crates/goose/src/session/diagnostics.rs b/crates/goose/src/session/diagnostics.rs
index e0b55973d8f1..31c29b047e79 100644
--- a/crates/goose/src/session/diagnostics.rs
+++ b/crates/goose/src/session/diagnostics.rs
@@ -1,6 +1,7 @@
 use crate::config::base::Config;
 use crate::config::extensions::get_enabled_extensions;
 use crate::config::paths::Paths;
+use crate::prompt_template::list_templates;
 use crate::providers::utils::LOGS_TO_KEEP;
 use crate::session::SessionManager;
 use serde::{Deserialize, Serialize};
@@ -130,6 +131,12 @@ pub async fn generate_diagnostics(
             }
         }
 
+        for template in list_templates() {
+            let content = template.user_content.unwrap_or(template.default_content);
+            zip.start_file(format!("prompts/{}.txt", template.name), options)?;
+            zip.write_all(content.as_bytes())?;
+        }
+
         zip.finish()?;
     }