diff --git a/.gitignore b/.gitignore
index 28bb11e..2976d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ content-*/*
 
 build/
 local/
-keys/
\ No newline at end of file
+keys/
+secure_boot/
diff --git a/Earthfile b/Earthfile
index a3a485c..97534ea 100644
--- a/Earthfile
+++ b/Earthfile
@@ -87,7 +87,11 @@ ELSE
     ARG STYLUS_PACKAGE_BASE=gcr.io/spectro-images-public/stylus-linux-$ARCH:$PE_VERSION
 END
 
-ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$PE_VERSION-$K8S_VERSION
+IF [ "$CUSTOM_TAG" != "" ]
+    ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$PE_VERSION-$CUSTOM_TAG
+ELSE
+    ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$PE_VERSION
+END
 ARG CMDLINE="stylus.registration"
 
 build-all-images:
@@ -390,11 +394,6 @@ provider-image:
     FROM --platform=linux/${ARCH} +base-image
     # added PROVIDER_K8S_VERSION to fix missing image in ghcr.io/kairos-io/provider-*
     ARG IMAGE_REPO
-    IF [ "$CUSTOM_TAG" != "" ]
-        ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$PE_VERSION-$CUSTOM_TAG
-    ELSE
-        ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$PE_VERSION
-    END
 
     IF [ "$K8S_DISTRIBUTION" = "kubeadm" ] || [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ]
         ARG BASE_K8S_VERSION=$K8S_VERSION