diff --git a/Makefile b/Makefile
index d3844766..d6a4ba99 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ version = 39
 base_dir = $(shell pwd)
 image_repo = ghcr.io/ublue-os
 image_name = base-main
+image_tag = $(version)
 variant = Silverblue
+web_ui = false
 
 image_repo_escaped = $(subst /,\/,$(image_repo))
 image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))
@@ -14,6 +16,10 @@ else
 lorax_args = --nomacboot
 endif
 
+ifeq ($(web_ui),true)
+lorax_args += -i anaconda-webui
+endif
+
 $(image_name)-$(version).iso: boot.iso container/$(image_name)-$(version) xorriso/input.txt 
 	xorriso -dialog on < $(base_dir)/xorriso/input.txt
 
@@ -31,9 +37,9 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
 
 container/$(image_name)-$(version):
 	mkdir container
-	podman pull $(image_repo)/$(image_name):$(version)
-	podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(version)
-	podman rmi $(image_repo)/$(image_name):$(version)
+	podman pull $(image_repo)/$(image_name):$(image_tag)
+	podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(image_tag)
+	podman rmi $(image_repo)/$(image_name):$(image_tag)
 
 install-deps:
 	dnf install -y lorax xorriso podman git rpm-ostree
diff --git a/lorax_templates/configure_upgrades.tmpl.in b/lorax_templates/configure_upgrades.tmpl.in
index 2bbb92ae..498bf252 100644
--- a/lorax_templates/configure_upgrades.tmpl.in
+++ b/lorax_templates/configure_upgrades.tmpl.in
@@ -1,3 +1,7 @@
 append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
 append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
-append usr/share/anaconda/interactive-defaults.ks "%end"
\ No newline at end of file
+append usr/share/anaconda/interactive-defaults.ks "%end"
+
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end"
\ No newline at end of file