diff --git a/Makefile b/Makefile
index 3f5cd1b..ebdb8dd 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ deploy.iso: boot.iso xorriso/input.txt $(image_name)-$(version)
 boot.iso: lorax_templates/set_installer.tmpl
 	rm -Rf results
 	lorax -p Fedora -v $(version) -r $(version) -t $(variant) \
-          --isfinal --buildarch=$(arch) --volid=Fedora-S-dvd-$(arch)-$(version) \
+          --isfinal --buildarch=$(arch) --volid=$(image_name)-$(arch)-$(version) \
           --macboot --noupgrade \
           --repo /etc/yum.repos.d/fedora.repo \
           --repo /etc/yum.repos.d/fedora-updates.repo \
@@ -38,7 +38,7 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
 
 
 xorriso/input.txt: xorriso/gen_input.sh
-	bash xorriso/gen_input.sh > input.txt
+	bash xorriso/gen_input.sh > xorriso/input.txt
 
 xorriso/%.sh: xorriso/%.sh.in
 	sed 's/@IMAGE_NAME@/$(image_name)-$(version)/' xorriso/$*.sh.in > xorriso/$*.sh
diff --git a/lorax_templates/set_installer.tmpl.in b/lorax_templates/set_installer.tmpl.in
index b7a0950..13332ff 100644
--- a/lorax_templates/set_installer.tmpl.in
+++ b/lorax_templates/set_installer.tmpl.in
@@ -1 +1 @@
-append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --remote='ostree-unverified-image:docker://@IMAGE_REPO@/@IMAGE_NAME@:@VERSION@' --url=/run/install/repo/@IMAGE_NAME@-@VERSION@ --transport=oci --no-signature-verification"
\ No newline at end of file
+append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=/run/install/repo/@IMAGE_NAME@-@VERSION@ --transport=oci --no-signature-verification"
\ No newline at end of file