diff --git a/src/deb/local.rs b/src/deb/local.rs
index f5382d9..82c3fd3 100644
--- a/src/deb/local.rs
+++ b/src/deb/local.rs
@@ -169,7 +169,8 @@ pub async fn build(
     }
 
     // Find the actual package directory
-    let package_dir = crate::deb::find_package_directory(Path::new(build_root), package, version)?;
+    let package_dir =
+        crate::deb::find_package_directory(Path::new(build_root), package, version, &ctx)?;
     let package_dir_str = package_dir
         .to_str()
         .ok_or("Invalid package directory path")?;
diff --git a/src/deb/mod.rs b/src/deb/mod.rs
index 380f6d5..2abbcf1 100644
--- a/src/deb/mod.rs
+++ b/src/deb/mod.rs
@@ -118,9 +118,8 @@ pub(crate) fn find_package_directory(
     parent_dir: &Path,
     package: &str,
     version: &str,
+    ctx: &context::Context,
 ) -> Result<PathBuf, Box<dyn Error>> {
-    let ctx = context::current();
-
     // Try package/package pattern first
     let package_dir = parent_dir.join(package).join(package);
     if ctx.exists(&package_dir)? && ctx.exists(&package_dir.join("debian"))? {
@@ -243,8 +242,10 @@ mod tests {
         log::info!("Successfully pulled package {}", package);
 
         // Change directory to the package directory
-        let cwd = crate::deb::find_package_directory(cwd, package, &package_info.stanza.version)
-            .expect("Cannot find package directory");
+        let ctx = crate::context::current();
+        let cwd =
+            crate::deb::find_package_directory(cwd, package, &package_info.stanza.version, &ctx)
+                .expect("Cannot find package directory");
         log::debug!("Package directory: {}", cwd.display());
 
         log::info!("Starting binary package build...");
diff --git a/src/deb/sbuild.rs b/src/deb/sbuild.rs
index ccc3524..42c38dc 100644
--- a/src/deb/sbuild.rs
+++ b/src/deb/sbuild.rs
@@ -15,7 +15,8 @@ pub fn build(
     let ctx = context::current();
 
     // Find the actual package directory
-    let package_dir = crate::deb::find_package_directory(Path::new(build_root), package, version)?;
+    let package_dir =
+        crate::deb::find_package_directory(Path::new(build_root), package, version, &ctx)?;
     let package_dir_str = package_dir
         .to_str()
         .ok_or("Invalid package directory path")?;