diff --git a/Makefile b/Makefile
index 63280e3..b2ca492 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ build/deploy.iso:  boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t
 
 # Step 1: Generate Lorax Templates
 lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
-	$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED IMAGE_REPO)
+	$(eval _VARS = IMAGE_NAME IMAGE_TAG _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED)
 	$(foreach var,$(_VARS),$(var)=$($(var))) envsubst '$(foreach var,$(_VARS),$$$(var))' < $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
 
 
diff --git a/lorax_templates/configure_upgrades.tmpl.in b/lorax_templates/configure_upgrades.tmpl.in
index b87bb33..006c917 100644
--- a/lorax_templates/configure_upgrades.tmpl.in
+++ b/lorax_templates/configure_upgrades.tmpl.in
@@ -1,7 +1,7 @@
 append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
 append usr/share/anaconda/interactive-defaults.ks "if (which bootc &> /dev/null)"
 append usr/share/anaconda/interactive-defaults.ks "then"
-append usr/share/anaconda/interactive-defaults.ks "bootc switch ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
+append usr/share/anaconda/interactive-defaults.ks "bootc switch ${_IMAGE_REPO_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}"
 append usr/share/anaconda/interactive-defaults.ks "else"
 append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
 append usr/share/anaconda/interactive-defaults.ks "fi"
@@ -10,7 +10,7 @@ append usr/share/anaconda/interactive-defaults.ks "%end"
 append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
 append usr/share/anaconda/interactive-defaults.ks "if (which bootc &> /dev/null)"
 append usr/share/anaconda/interactive-defaults.ks "then"
-append usr/share/anaconda/interactive-defaults.ks "bootc switch ${IMAGE_REPO}/${IMAGE_NAME}:${IMAGE_TAG}"
+append usr/share/anaconda/interactive-defaults.ks "bootc switch ${_IMAGE_REPO_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}"
 append usr/share/anaconda/interactive-defaults.ks "else"
 append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/${_IMAGE_REPO_DOUBLE_ESCAPED}\/${IMAGE_NAME}:${IMAGE_TAG}/' /ostree/deploy/default/deploy/*.origin"
 append usr/share/anaconda/interactive-defaults.ks "fi"