diff --git a/crates/lib/src/bootc_composefs/digest.rs b/crates/lib/src/bootc_composefs/digest.rs
index 0ddef9631..ca340bcea 100644
--- a/crates/lib/src/bootc_composefs/digest.rs
+++ b/crates/lib/src/bootc_composefs/digest.rs
@@ -11,6 +11,7 @@ use cap_std_ext::cap_std::fs::Dir;
 use composefs::dumpfile;
 use composefs::fsverity::FsVerityHashValue;
 use composefs_boot::BootOps as _;
+use fn_error_context::context;
 use tempfile::TempDir;
 
 use crate::store::ComposefsRepository;
@@ -49,6 +50,7 @@ pub(crate) fn new_temp_composefs_repo() -> Result<(TempDir, Arc<ComposefsReposit
 /// * The path is "/" (cannot operate on active root filesystem)
 /// * The filesystem cannot be read
 /// * The transform or digest computation fails
+#[context("Computing composefs digest")]
 pub(crate) fn compute_composefs_digest(
     path: &Utf8Path,
     write_dumpfile_to: Option<&Utf8Path>,
diff --git a/crates/lib/src/bootc_kargs.rs b/crates/lib/src/bootc_kargs.rs
index 50f0c09b5..e85c1276e 100644
--- a/crates/lib/src/bootc_kargs.rs
+++ b/crates/lib/src/bootc_kargs.rs
@@ -6,6 +6,7 @@ use cap_std_ext::cap_std::fs::Dir;
 use cap_std_ext::cap_std::fs_utf8::Dir as DirUtf8;
 use cap_std_ext::dirext::CapStdExtDirExt;
 use cap_std_ext::dirext::CapStdExtDirExtUtf8;
+use fn_error_context::context;
 use ostree::gio;
 use ostree_ext::ostree;
 use ostree_ext::ostree::Deployment;
@@ -107,6 +108,7 @@ pub(crate) fn compute_new_kargs(
 
 /// Load and parse all bootc kargs.d files in the specified root, returning
 /// a combined list.
+#[context("Getting kargs in root")]
 pub(crate) fn get_kargs_in_root(d: &Dir, sys_arch: &str) -> Result<CmdlineOwned> {
     // If the directory doesn't exist, that's OK.
     let Some(d) = d.open_dir_optional(KARGS_PATH)?.map(DirUtf8::from_cap_std) else {
diff --git a/crates/lib/src/kernel.rs b/crates/lib/src/kernel.rs
index 6cfd85156..c01238830 100644
--- a/crates/lib/src/kernel.rs
+++ b/crates/lib/src/kernel.rs
@@ -10,6 +10,7 @@ use anyhow::Result;
 use camino::Utf8PathBuf;
 use cap_std_ext::cap_std::fs::Dir;
 use cap_std_ext::dirext::CapStdExtDirExt;
+use fn_error_context::context;
 use serde::Serialize;
 
 use crate::bootc_composefs::boot::EFI_LINUX;
@@ -63,6 +64,7 @@ impl From<KernelInternal> for Kernel {
 /// layout with `/usr/lib/modules/<version>/vmlinuz`.
 ///
 /// Returns `None` if no kernel is found.
+#[context("Finding kernel")]
 pub(crate) fn find_kernel(root: &Dir) -> Result<Option<KernelInternal>> {
     // First, try to find a UKI
     if let Some(uki_path) = find_uki_path(root)? {