diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 35059faa..62c23d33 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -128,6 +128,7 @@ jobs:
           flatpak_remote_refs_dir: ${{ steps.generate-flatpak-dir-shortname.outputs.flatpak-dir-shortname }}
           enable_flatpak_dependencies: "false"
           extra_boot_params: ${{ steps.generate-extra-params.outputs.extra-boot-params }}
+          additional_templates: 'installer/lorax_templates/remote_root_password_prompt.tmpl'
 
       - name: Move ISOs to Upload Directory
         id: upload-directory
diff --git a/installer/lorax_templates/remove_root_password_prompt.tmpl b/installer/lorax_templates/remove_root_password_prompt.tmpl
new file mode 100644
index 00000000..9981e98d
--- /dev/null
+++ b/installer/lorax_templates/remove_root_password_prompt.tmpl
@@ -0,0 +1,4 @@
+<%page args="variant"/>
+%if variant == "Kinoite":
+append etc/anaconda/profile.d/fedora-kinoite.conf "[User Interface]\\nhidden_spokes =\\n    PasswordSpoke"
+%endif