diff --git a/Earthfile b/Earthfile
index 89f18e8..2315e6f 100644
--- a/Earthfile
+++ b/Earthfile
@@ -303,7 +303,8 @@ SAVE_IMAGE:
         END
     ELSE
         ARG EARTHLY_GIT_BRANCH
-        SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_BRANCH}${SUFFIX}"
+        ARG IMAGE_TAG="$(echo "${EARTHLY_GIT_BRANCH}" | sed 's|/|_|g')"
+        SAVE IMAGE --push "${IMAGE}:${IMAGE_TAG}${SUFFIX}"
     END
     ARG EARTHLY_GIT_HASH
     SAVE IMAGE --push "${IMAGE}:${EARTHLY_GIT_HASH}${SUFFIX}"
diff --git a/process/drivers/skopeo_driver.rs b/process/drivers/skopeo_driver.rs
index c5a88e7..acdfa5d 100644
--- a/process/drivers/skopeo_driver.rs
+++ b/process/drivers/skopeo_driver.rs
@@ -1,6 +1,5 @@
 use std::{process::Stdio, time::Duration};
 
-use blue_build_utils::constants::SUDO_ASKPASS;
 use cached::proc_macro::cached;
 use colored::Colorize;
 use comlexr::cmd;
@@ -77,7 +76,7 @@ impl super::OciCopy for SkopeoDriver {
                 } else {
                     "skopeo"
                 },
-                if use_sudo && blue_build_utils::has_env_var(SUDO_ASKPASS) => [
+                if use_sudo && blue_build_utils::has_env_var(blue_build_utils::constants::SUDO_ASKPASS) => [
                     "-A",
                     "-p",
                     format!(
diff --git a/process/drivers/traits.rs b/process/drivers/traits.rs
index 01d1876..8d22f02 100644
--- a/process/drivers/traits.rs
+++ b/process/drivers/traits.rs
@@ -287,6 +287,8 @@ pub trait RechunkDriver: RunDriver + BuildDriver + ContainerMountDriver {
         ))
         .into_diagnostic()?;
 
+        Self::login()?;
+
         Self::build(
             &BuildOpts::builder()
                 .image(raw_image.to_string())