diff --git a/Makefile b/Makefile
index 5d8d0217..b17669eb 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
 boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.tmpl
 	rm -Rf $(_BASE_DIR)/results
 	lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \
-          --isfinal --buildarch=$(ARCH) --volid=$(IMAGE_NAME)-$(ARCH)-$(VERSION) \
+          --isfinal --buildarch=$(ARCH) --volid=$(IMAGE_NAME)-$(ARCH)-$(IMAGE_TAG) \
           $(_LORAX_ARGS) \
           --repo /etc/yum.repos.d/fedora.repo \
           --repo /etc/yum.repos.d/fedora-updates.repo \
diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in
index 30d73fa6..76d419e8 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@@ -3,13 +3,12 @@
 echo "-indev $(pwd)/boot.iso"
 echo "-outdev $(pwd)/output/@IMAGE_NAME@-@IMAGE_TAG@.iso"
 echo "-boot_image any replay"
-echo "-volid @IMAGE_NAME@-@ARCH@-@IMAGE_TAG@"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
 cd container
-for file in $(find @IMAGE_NAME@-@IMAGE_TAG@)
-do
-    echo "-map $(pwd)/${file} ${file}"
-    echo "-chmod 0444 ${file}"
+for file in $(find @IMAGE_NAME@-@IMAGE_TAG@); do
+	echo "-map $(pwd)/${file} ${file}"
+	echo "-chmod 0444 ${file}"
 done
-echo "-end"
\ No newline at end of file
+echo "-end"
+