diff --git a/Makefile b/Makefile
index 539dc7e..343505b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,7 @@ IMAGE_TAG = $(VERSION)
 VARIANT = Server
 WEB_UI = false
 REPOS = /etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo
+ADDITIONAL_TEMPLATES = ""
 
 # Generated vars
 ## Formatting = _UPPERCASE
@@ -58,6 +59,7 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
           $(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \
           --add-template $(_BASE_DIR)/lorax_templates/set_installer.tmpl \
 		  --add-template $(_BASE_DIR)/lorax_templates/configure_upgrades.tmpl \
+		  $(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \
           $(_BASE_DIR)/results/
 	mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
 
diff --git a/action.yml b/action.yml
index 77c4708..f28a7fe 100644
--- a/action.yml
+++ b/action.yml
@@ -33,6 +33,9 @@ inputs:
     description: Version of the action container to run
     required: true
     default: "latest"
+  additional_templates:
+    description: Space delimetered list of additional Lorax templates to include
+    required: false
 
 runs:
   using: composite
@@ -47,4 +50,5 @@ runs:
           VARIANT=${{ inputs.variant }} \
           VERSION=${{ inputs.version }} \
           IMAGE_TAG=${{ inputs.image_tag || inputs.version }} \
-          WEB_UI=${{ inputs.web_ui }}
+          WEB_UI=${{ inputs.web_ui }} \
+          "ADDITIONAL_TEMPLATES=${{ inputs.additional_templates }}"
diff --git a/xorriso/gen_input.sh.in b/xorriso/gen_input.sh.in
index 800faab..b6fadeb 100644
--- a/xorriso/gen_input.sh.in
+++ b/xorriso/gen_input.sh.in
@@ -6,7 +6,7 @@ echo "-boot_image any replay"
 echo "-joliet on"
 echo "-compliance joliet_long_names"
 cd container
-for file in $(find @IMAGE_NAME@-@VERSION@)
+for file in $(find @IMAGE_NAME@-@IMAGE_TAG@)
 do
     echo "-map $(pwd)/${file} ${file}"
     echo "-chmod 0444 ${file}"