diff --git a/Makefile b/Makefile
index de90d2c..65557ce 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ $(ISO_NAME): results/images/boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorris
 
 # Download the secure boot key
 sb_pubkey.der:
-	curl --fail -L -o sb_pubkey.der $(SECURE_BOOT_KEY_URL) && ls -alh
+	curl --fail -L -o sb_pubkey.der $(SECURE_BOOT_KEY_URL)
 
 # Build boot.iso using Lorax
 results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) $(if $(SECURE_BOOT_KEY_URL),sb_pubkey.der)
diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh
index ef27010..0309e0f 100644
--- a/xorriso/gen_input.sh
+++ b/xorriso/gen_input.sh
@@ -34,11 +34,14 @@ then
     popd > /dev/null
 fi
 
-if [ -f $(pwd)/sb_pubkey.der ]
+pushd "${PWD}/../" > /dev/null
+ls -alh ${PWD}
+if [ -f ${PWD}/sb_pubkey.der ]
 then
-	echo "-map $(pwd)/../sb_pubkey.der sb_pubkey.der"
+	echo "-map ${PWD}/sb_pubkey.der sb_pubkey.der"
 	echo "-chmod 0444 /sb_pubkey.der"
 fi
+popd > /dev/null
 
 pushd "${PWD}/../container" > /dev/null
 for file in $(find "${IMAGE_NAME}-${IMAGE_TAG}" -type f)