diff --git a/.github/workflows/iso.yml b/.github/workflows/iso.yml
index 921020e..45edb58 100644
--- a/.github/workflows/iso.yml
+++ b/.github/workflows/iso.yml
@@ -79,6 +79,7 @@ jobs:
         run: |
           dnf install -y \
           lorax \
+          xorriso \
           podman \
           git
 
@@ -117,12 +118,20 @@ jobs:
           --enablerepo updates \
           -i podman \
           ./results/
+
+      - name: Generate xorriso input
+        run: |
+          bash scripts/gen_xorriso.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: Fedora-LiveCD.iso
-          path: results/images/boot.iso
+          name: ISOs
+          path: results/images/*.iso
           if-no-files-found: error
           retention-days: 0
           compression-level: 0
diff --git a/scripts/gen_xorriso.sh b/scripts/gen_xorriso.sh
new file mode 100644
index 0000000..7a27ad5
--- /dev/null
+++ b/scripts/gen_xorriso.sh
@@ -0,0 +1,16 @@
+#!/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"
+cache_files=$(find /registry_cache)
+for file in ${cache_files}
+do
+    file=$(echo $file | sed 's/^\/registry_cache\/\(.*\)/\1/')
+    echo "-map $(pwd)/${file} repo_cache/${file}"
+    echo "-chmod 0444 repo_cache/${file}"
+done
+echo "-end"
\ No newline at end of file