diff --git a/process/drivers/skopeo_driver.rs b/process/drivers/skopeo_driver.rs
index acdfa5d..c5a88e7 100644
--- a/process/drivers/skopeo_driver.rs
+++ b/process/drivers/skopeo_driver.rs
@@ -1,5 +1,6 @@
 use std::{process::Stdio, time::Duration};
 
+use blue_build_utils::constants::SUDO_ASKPASS;
 use cached::proc_macro::cached;
 use colored::Colorize;
 use comlexr::cmd;
@@ -76,7 +77,7 @@ impl super::OciCopy for SkopeoDriver {
                 } else {
                     "skopeo"
                 },
-                if use_sudo && blue_build_utils::has_env_var(blue_build_utils::constants::SUDO_ASKPASS) => [
+                if use_sudo && blue_build_utils::has_env_var(SUDO_ASKPASS) => [
                     "-A",
                     "-p",
                     format!(
diff --git a/process/drivers/traits.rs b/process/drivers/traits.rs
index db757ce..9fbdb55 100644
--- a/process/drivers/traits.rs
+++ b/process/drivers/traits.rs
@@ -287,8 +287,6 @@ pub trait RechunkDriver: RunDriver + BuildDriver + ContainerMountDriver {
         ))
         .into_diagnostic()?;
 
-        Self::login(true)?;
-
         Self::build(
             &BuildOpts::builder()
                 .image(raw_image.to_string())
diff --git a/src/commands/build.rs b/src/commands/build.rs
index 54c2799..da8e25b 100644
--- a/src/commands/build.rs
+++ b/src/commands/build.rs
@@ -161,7 +161,7 @@ impl BlueBuildCommand for BuildCommand {
         if self.push {
             blue_build_utils::check_command_exists("cosign")?;
             Driver::check_signing_files(&CheckKeyPairOpts::builder().dir(Path::new(".")).build())?;
-            Driver::login(false)?;
+            Driver::login(self.rechunk)?;
             Driver::signing_login()?;
         }