diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index 6ec1980..72e5d1d 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           arch: ${{ env.ARCH}}
           image_name: ${{ env.IMAGE_NAME}}
-          imagE_repo: ${{ env.IMAGE_REPO}}
+          image_repo: ${{ env.IMAGE_REPO}}
           version: ${{ env.VERSION }}
           variant: ${{ env.VARIANT }}
 
diff --git a/Makefile b/Makefile
index 01f118a..8a7df0d 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ build/deploy.iso.iso:  boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/inp
 
 # Step 1: Generate Lorax Templates
 lorax_templates/%.tmpl: lorax_templates/%.tmpl.in
-	sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/'                        $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
+	sed 's/@IMAGE_NAME@/$(IMAGE_NAME)/'                         $(_BASE_DIR)/lorax_templates/$*.tmpl.in > $(_BASE_DIR)/lorax_templates/$*.tmpl
 
-	sed 's/@IMAGE_TAG@/$(IMAGE_TAG)/'                          $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
+	sed 's/@IMAGE_TAG@/$(IMAGE_TAG)/'                           $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
 	mv $(_BASE_DIR)/lorax_templates/$*.tmpl{.tmp,}
 	
 	sed 's/@IMAGE_REPO_ESCAPED@/$(_IMAGE_REPO_DOUBLE_ESCAPED)/' $(_BASE_DIR)/lorax_templates/$*.tmpl > $(_BASE_DIR)/lorax_templates/$*.tmpl.tmp
diff --git a/action.yml b/action.yml
index d57642f..00e9205 100644
--- a/action.yml
+++ b/action.yml
@@ -27,7 +27,7 @@ inputs:
     required: false
   web_ui:
     description: Enable Anaconda WebUI
-    required: true
+    required: false
     default: "false"
 
 runs:
@@ -39,5 +39,5 @@ runs:
     - IMAGE_REPO=${{ inputs.image_repo }}
     - VARIANT=${{ inputs.variant }}
     - VERSION=${{ inputs.version }}
-    - IMAGE_TAG=${{ inputs.image_tag }}
+    - IMAGE_TAG=${{ inputs.image_tag || inputs.version }}
     - WEB_UI=${{ inputs.web_ui }}