diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index 293e01a..468f4a5 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -48,6 +48,12 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Download image
+        run: |
+          podman pull ghcr.io/ublue-os/base-main:39
+          podman save --format oci-archive -o base-main-39.tar ghcr.io/ublue-os/base-main:39
+          podman rmi ghcr.io/ublue-os/base-main:39
+
       - name: Create boot.iso
         env:
           version: "39"
@@ -58,16 +64,23 @@ jobs:
           --macboot --noupgrade \
           --repo /etc/yum.repos.d/fedora.repo \
           --repo /etc/yum.repos.d/fedora-updates.repo \
-          --add-template ${GITHUB_WORKSPACE}/lorax_templates/embed_image.tmpl \
           --add-template ${GITHUB_WORKSPACE}/lorax_templates/set_installer.tmpl \
           --rootfs-size 9 \
           ./results/
 
+      - name: Generate xorriso input
+        run: |
+          bash xorriso/gen_input.sh | tee xorriso.txt
+
+      - name: Add additional files to ISO
+        run: |
+          xorriso -dialog on < xorriso.txt
+
       - name: Upload ISO as artifact
         uses: actions/upload-artifact@v4
         with:
           name: ISOs
-          path: results/images/boot.iso
+          path: results/images/deploy.iso
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
diff --git a/lorax_templates/set_installer.tmpl b/lorax_templates/set_installer.tmpl
index 41a71a9..ac76611 100644
--- a/lorax_templates/set_installer.tmpl
+++ b/lorax_templates/set_installer.tmpl
@@ -1 +1 @@
-append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=file:///base-main-39.tar --transport=oci-archive --no-signature-verification"
\ No newline at end of file
+append usr/share/anaconda/interactive-defaults.ks "ostreecontainer --url=file:///run/install/repo/base-main-39.tar --transport=oci-archive --no-signature-verification"
\ No newline at end of file
diff --git a/xorriso/gen_input.sh b/xorriso/gen_input.sh
new file mode 100644
index 0000000..3726f36
--- /dev/null
+++ b/xorriso/gen_input.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+echo "-indev $(pwd)/results/images/boot.iso"
+echo "-outdev $(pwd)/results/images/deploy.iso"
+echo "-boot_image any replay"
+echo "-volid Fedora-S-dvd-x86_64-39"
+echo "-joliet on"
+echo "-compliance joliet_long_names"
+echo "-map $(pwd)/base-main-39.tar base-main-39.tar"
+echo "-chmod 0444 base-main-39.tar"
+echo "-end"
\ No newline at end of file