diff --git a/builder/core/iso_generator.py b/builder/core/iso_generator.py
index 1733faaa..7ba7ab3b 100644
--- a/builder/core/iso_generator.py
+++ b/builder/core/iso_generator.py
@@ -100,6 +100,7 @@ def iso_generator_main(
     logging.info("=> Generating ISO image with xorriso...")
     xorriso_command = [
         "xbps-uchroot",
+        "--",
         paths['PEPHOSTDIR'],
         "/usr/bin/xorriso",
         "-as", "mkisofs",
diff --git a/builder/core/squashfs.py b/builder/core/squashfs.py
index 31f5ea18..ea4b2277 100644
--- a/builder/core/squashfs.py
+++ b/builder/core/squashfs.py
@@ -97,7 +97,8 @@ def create_squashfs_image(rootfs_dir, squashfs_output_file, pep_host_dir, logger
         output_dir = os.path.dirname(squashfs_output_file)
         os.makedirs(output_dir, exist_ok=True)
         mksquashfs_command = [
-            "xbps-uchroot", 
+            "xbps-uchroot",
+            "--",
             pep_host_dir,
             "/usr/bin/mksquashfs",
             os.path.join(build_dir, "tmp"),