diff --git a/iso/empanadas/empanadas/templates/xorriso.tmpl.txt b/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
index 133aa11..15b3c5a 100644
--- a/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
+++ b/iso/empanadas/empanadas/templates/xorriso.tmpl.txt
@@ -1,6 +1,8 @@
 -indev {{ boot_iso }}
 -outdev {{ isoname }}
 -boot_image any replay
+-joliet
+-compliance joliet_long_names
 -volid {{ volid }}
 {{ graft }}
 -end
diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
index 1a42bdf..d406232 100644
--- a/iso/empanadas/empanadas/util/shared.py
+++ b/iso/empanadas/empanadas/util/shared.py
@@ -833,7 +833,13 @@ class Shared:
             isokwargs["input_charset"] = None
 
         if opts['use_xorrisofs']:
-            cmd = ['/usr/bin/xorriso', '-dialog', 'on', '<', opts['graft_points']]
+            cmd = [
+                    '/usr/bin/xorriso',
+                    '-dialog',
+                    'on',
+                    '<',
+                    opts['graft_points']
+            ]
         else:
             cmd = Shared.get_mkisofs_cmd(
                     opts['iso_name'],